Add new grid support