Include client and vendor in the data too.
Merge pull request #167 from rogerhu/include_query

Include_Query