Keep Datastore semantics