Added Grid to generation of api classes #931