Added some documentation to DataQuery and refactored DataQuery.payloadAsHashMap
Refactor to abstract DataQuery from the annotations mechanism