More structure in the grid generation