Moved some Map logic into Game model