diff --git a/data/saas/dataset/recurly_dataset.yml b/data/saas/dataset/recurly_dataset.yml
index 587ce4d2eee..db3a1742971 100644
--- a/data/saas/dataset/recurly_dataset.yml
+++ b/data/saas/dataset/recurly_dataset.yml
@@ -66,11 +66,11 @@ dataset:
                 fidesops_meta:
                   data_type: boolean
               - name: first_name
-                data_categories: [system.operations]
+                data_categories: [user.name]
                 fidesops_meta:
                   data_type: string
               - name: last_name
-                data_categories: [system.operations]
+                data_categories: [user.name]
                 fidesops_meta:
                   data_type: string
               - name: company
@@ -239,51 +239,51 @@ dataset:
                 fidesops_meta:
                   data_type: string
               - name: first_name
-                data_categories: [system.operations]
+                data_categories: [user.name]
                 fidesops_meta:
                   data_type: string
               - name: last_name
-                data_categories: [system.operations]
+                data_categories: [user.name]
                 fidesops_meta:
                   data_type: string
               - name: company
-                data_categories: [system.operations]
+                data_categories: [user.location]
                 fidesops_meta:
                   data_type: string
               - name: phone
-                data_categories: [system.operations]
+                data_categories: [user.contact.phone_number]
                 fidesops_meta:
                   data_type: string
               - name: street1
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.street]
                 fidesops_meta:
                   data_type: string
               - name: street2
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.street]
                 fidesops_meta:
                   data_type: string
               - name: city
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.city]
                 fidesops_meta:
                   data_type: string
               - name: region
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.state]
                 fidesops_meta:
                   data_type: string
               - name: postal_code
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.postal_code]
                 fidesops_meta:
                   data_type: string
               - name: country
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.country]
                 fidesops_meta:
                   data_type: string
               - name: nickname
-                data_categories: [system.operations]
+                data_categories: [user.name]
                 fidesops_meta:
                   data_type: string
               - name: email
-                data_categories: [system.operations]
+                data_categories: [user.contact.email]
                 fidesops_meta:
                   data_type: string
               - name: vat_number
@@ -291,11 +291,11 @@ dataset:
                 fidesops_meta:
                   data_type: string
               - name: id
-                data_categories: [system.operations]
+                data_categories: [user.unique_id]
                 fidesops_meta:
                   data_type: string
               - name: account_id
-                data_categories: [system.operations]
+                data_categories: [user.unique_id]
                 fidesops_meta:
                   data_type: string
               - name: created_at
@@ -337,7 +337,7 @@ dataset:
             fidesops_meta:
               data_type: string
           - name: account_id
-            data_categories: [system.operations]
+            data_categories: [user.unique_id]
             fidesops_meta:
               data_type: string
           - name: primary_payment_method
@@ -357,36 +357,39 @@ dataset:
             fidesops_meta:
               data_type: string
           - name: company
+            data_categories: [user.location]
+            fidesops_meta:
+              data_type: string
           - name: address
             fidesops_meta:
               data_type: object
             fields:
               - name: street1
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.street]
                 fidesops_meta:
                   data_type: string
               - name: street2
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.street]
                 fidesops_meta:
                   data_type: string
               - name: city
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.city]
                 fidesops_meta:
                   data_type: string
               - name: region
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.state]
                 fidesops_meta:
                   data_type: string
               - name: postal_code
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.postal_code]
                 fidesops_meta:
                   data_type: string
               - name: country
-                data_categories: [system.operations]
+                data_categories: [user.contact.address.country]
                 fidesops_meta:
                   data_type: string
               - name: phone
-                data_categories: [system.operations]
+                data_categories: [user.contact.phone_number]
                 fidesops_meta:
                   data_type: string
           - name: vat_number