Added Grid and Token class