Include client and vendor in the data too.