More improvements on GameObjectFactory