Added the game context and modified the related files