diff --git a/API/Models/Category.yaml b/API/Models/Category.yaml
index 6285cacb..1ba473c9 100644
--- a/API/Models/Category.yaml
+++ b/API/Models/Category.yaml
@@ -2,38 +2,35 @@ title: "\U0001F6A7Category"
 type: object
 description: "# Status: \U0001F6A7\n\n## ⚡ About\n\nA collection of DataPoints\n\n## \U0001F4E2 Used by\n- \U0001F4A0 \n\nDescribes PLD Categories."
 properties:
-  CategoryUID:
-    type: string
-  DataPoints:
+  id:
+    type: number
+  DataPoint:
     type: array
     items:
       $ref: ./DataPoint.yaml
-  PermalinkDocs:
+  DataSetLayer:
+    type: array
+    items:
+      $ref: ./DataSetLayer.yaml
+  nameShort:
     type: string
-  Definition:
-    type: object
-    properties:
-      Name:
-        type: string
-      Description:
-        type: string
-      Tags:
-        type: string
-      Order:
-        type: string
-        description: Indicates the render order of this category in the DSL.
-  CategoryStatus:
+  name:
     type: string
-  UI:
-    type: object
-    properties:
-      TDOLayout:
-        $ref: ./Layout.yaml
-      TabMaxWidth:
-        type: string
-      TabTitle:
-        type: string
-      TabTooltip:
-        type: string
-  DSLUID:
+  description:
     type: string
+  iconID:
+    type: string
+  tags:
+    type: array
+    items:
+      type: string
+  order:
+    type: number
+  createdAt:
+    type: string
+  updatedAt:
+    type: string
+  dataPoints:
+    type: array
+    items:
+      $ref: ./DataPoint.yaml
diff --git a/API/Models/DataPoint.yaml b/API/Models/DataPoint.yaml
index 617a647c..dfa98e64 100644
--- a/API/Models/DataPoint.yaml
+++ b/API/Models/DataPoint.yaml
@@ -2,71 +2,27 @@ title: "\U0001F6A7DataPoint"
 type: object
 description: "# Status: \U0001F6A7\n\n## ⚡ About\n\n\n## \U0001F4E2 Used by\n- \U0001F4A0 \n\nDescribes PLD Data Points.\n\n###URL fields\n???URLIconID\n\nURLDoc\nPermalink where this DataPoint is documented.\n \n???URLDP\n\nURLEditorGuide\nPermalink to the Editor's Guide (Encoding) for this DataPoint. \n\n###Date fields\nDateCreated\n\nDateUpdated"
 properties:
-  DataPointUID:
+  Category:
+    $ref: ./Category.yaml
+  id:
     type: string
-    description: "Universal ID\n\U0001F6A7 Document how it is generated"
-  Definition:
-    type: object
-    properties:
-      NameShort:
-        type: string
-      Name:
-        type: string
-      Description:
-        type: string
-      IconID:
-        type: string
-      '@@@Inheritance':
-        type: string
-      '@@@DPObjectType':
-        type: string
-      Right:
-        $ref: ./Right.yaml
-      Tags:
-        type:
-          - string
-          - array
-        items:
-          $ref: ./Tag.yaml
-      Tooltip:
-        type: string
-      Definition:
-        type: string
-      Encoding:
-        $ref: ./Encoding.yaml
-  Status:
+  nameShort:
     type: string
-  DateCreated:
-    $ref: ./Date.yaml
-  DateUpdated:
-    $ref: ./Date.yaml
-  Stats:
-    type:
-      - string
-      - array
-    items:
-      $ref: ./Stat.yaml
-  Answers:
-    type:
-      - string
-      - array
-    items:
-      $ref: ./Answer.yaml
-  URLDoc:
-    $ref: ./Link.yaml
-  URLEditorGuide:
-    $ref: ./Link.yaml
-  DSLUID:
+  name:
     type: string
-  Log:
-    type:
-      - string
-      - array
-    items:
-      $ref: ./Log.yaml
-  SnapshotUID:
-    type:
-      - string
-      - array
+  description:
+    type: string
+  iconID:
+    type: string
+  tags:
+    type: array
     items:
-      $ref: ./Snapshot.yaml
+      type: string
+  order:
+    type: number
+  createdAt:
+    type: string
+  updatedAt:
+    type: string
+  category:
+    type: object