Updated logic on saving new items.
