Add support for grid and first spec