Refactored grid to contain additional information