Adapted to GameCore Changes