Removed entity manager and added container