Fields: Grid fields refactoring