Grid format updated for M2.5 and M2.6