diff --git a/mappings/cwe/cwe.json b/mappings/cwe/cwe.json
index b960abb6..e7b953b6 100644
--- a/mappings/cwe/cwe.json
+++ b/mappings/cwe/cwe.json
@@ -468,7 +468,52 @@
           "cwe": ["CWE-434"]
         }                
          ]
-        }        
+        },
+        {
+          "id": "kiosk_escape_or_breakout",
+          "cwe": ["CWE-284"]
+        },
+        {
+          "id": "poorly_configured_disk_encryption",
+          "cwe": ["CWE-326"]
+        }, 
+        {
+          "id": "shared_credentials_on_storage",
+          "cwe": ["CWE-798"]
+        }, 
+        {
+          "id": "over_permissioned_credentials_on_storage",
+          "cwe": ["CWE-250"]
+        }, 
+        {
+          "id": "local_administrator_on_default_environment",
+          "cwe": ["CWE-276"]
+        }, 
+        {
+          "id": "poorly_configured_operating_system_security",
+          "cwe": ["CWE-16"]
+        }, 
+        {
+          "id": "recovery_of_disk_contains_sensitive_material",
+          "cwe": ["CWE-522"]
+        }, 
+        {
+          "id": "failure_to_remove_sensitive_artifacts_from_disk",
+          "cwe": ["CWE-459"]
+        },
+        {
+          "id": "data_not_encrypted_at_rest",
+      "children": [
+        {
+          "id": "sensitive",
+          "cwe": ["CWE-311"]
+        },
+        {
+          "id": "non_sensitive",
+          "cwe": ["CWE-311"]
+        }               
+         ]
+        }                                                                                 
       ]
     },
     {