GameSession refactoring