Comment new EntityFactory