Detached the controllers from the entities