Added Grid class