Made EntityFactory Singleton