Update more objects to subclass from GameObject #72