Add support for multiple grids