Refactored lots of GameObjectDefinition