Refactoring of Subgrid access