Made some changes for new GameAPI