Removed EntityFactory