Removed some extensions. Changed argument order for EntityRepositoryObserver
Removed Flag and Unflag and replaced it with a setter