Added grid related features