Added in the parsing to allow us to build up the metadata from the query