Grid format updated for M2.9 and M3.0