Refactor session structure to allow it to work whether being queried by user or by game.