[Game] Improve design with game changes