Adding grid support