Core: Grid core refactoring
Core: Grid core refactoring part 2