Simplified add/remove since collection is an observable object there is no need to mark entries