Update not replace

Objects in the store now get updated instead of being replaced.   Also, collections are distinguished between "current" and "self" collections.