Updated GridManager