More refactoring of GameTable