More transition to GameObject abstraction