Improved support for game state definition.'