Updated for GridMapLayoutOptimiser