diff --git a/nexpose/nexpose_asset.py b/nexpose/nexpose_asset.py
index 41f43b4..2748f46 100644
--- a/nexpose/nexpose_asset.py
+++ b/nexpose/nexpose_asset.py
@@ -62,18 +62,15 @@ def CreateFromJSON(json_dict):
         details.os_cpe = json_dict["os_cpe"]
         details.last_scan_id = json_dict['assessment']['json']['last_scan_id']
         details.last_scan_date = json_dict['assessment']['json']['last_scan_date']
-        # TODO:
-        # ----begin
-        details.files = []
-        details.vulnerability_instances = []
-        details.unique_identifiers = []
-        details.group_accounts = []
-        details.user_accounts = []
-        details.vulnerabilities = []
-        details.software = []
-        details.services = []
-        # TODO:
-        # ----end
+        details.files = json_dict['files']
+        details.vulnerability_instances = json_dict['vulnerability_instances']
+        details.unique_identifiers = json_dict['unique_identifiers']
+        details.group_accounts = json_dict['group_accounts']
+        details.user_accounts = json_dict['user_accounts']
+        details.vulnerabilities = json_dict['vulnerabilities']
+        details.software = json_dict['software']
+        details.services = json_dict['services']
+
         return details
 
     def __init__(self):