diff --git a/src/hub/dataload/sources/chembl/parser.py b/src/hub/dataload/sources/chembl/parser.py
index 318292c..706d6b3 100644
--- a/src/hub/dataload/sources/chembl/parser.py
+++ b/src/hub/dataload/sources/chembl/parser.py
@@ -22,9 +22,9 @@ def parse_data(data):
             for uniprot_accession in uniprot_accessions:
                 output = {
                     "_id": uniprot_accession,
-                    "chembl_target": item["target_chembl_id"],
-                    "xrefs": {
-                        "accession": uniprot_accession,
+                    "chembl": {
+                        "chembl_target": item["target_chembl_id"],
+                        "uniprot_accession": uniprot_accession,
                     },
                 }
                 yield output
diff --git a/src/hub/dataload/sources/chembl/upload.py b/src/hub/dataload/sources/chembl/upload.py
index 2457dc1..01ec842 100644
--- a/src/hub/dataload/sources/chembl/upload.py
+++ b/src/hub/dataload/sources/chembl/upload.py
@@ -54,20 +54,18 @@ def load_data(self, data_folder):
         target_filepaths = glob.iglob(
             os.path.join(data_folder, self.TARGET_FILENAME_PATTERN)
         )
-        # for doc in load_data(target_filepaths):
-        #    yield doc
         return self.keylookup(load_data)(target_filepaths)
 
     @classmethod
     def get_mapping(klass):
         mapping = {
-            "chembl_target": {
-                "type": "keyword",
-                "normalizer": "keyword_lowercase_normalizer",
-            },
-            "xrefs": {
+            "chembl": {
                 "properties": {
-                    "accession": {
+                    "chembl_target": {
+                        "type": "keyword",
+                        "normalizer": "keyword_lowercase_normalizer",
+                    },
+                    "uniprot_accession": {
                         "type": "keyword",
                         "normalizer": "keyword_lowercase_normalizer",
                     },