Changed datastructure in Game