Bools in Map changed to CellStates enum