Adds agencyID for to property URIs in data. Some optimizations