Update to align to new Grid + Flat support

The Flat method can be used to fetch data from a flattening service.
It's the same service but with an extension to be able to say what
properties to get.