Added support for basic grid parsing