Additional refactoring of new game handlers.