added upsert/remove/collectionModified/markCollectionModified [untested]