diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json
index e6e8f785..ad7edbda 100644
--- a/NewHorizons/Schemas/body_schema.json
+++ b/NewHorizons/Schemas/body_schema.json
@@ -102,10 +102,6 @@
       "description": "Add signals that can be heard via the signal-scope to this planet",
       "$ref": "#/definitions/SignalModule"
     },
-    "Singularity": {
-      "description": "Add a black or white hole to this planet",
-      "$ref": "#/definitions/SingularityModule"
-    },
     "Spawn": {
       "description": "Spawn the player at this planet",
       "$ref": "#/definitions/SpawnModule"
@@ -811,6 +807,13 @@
           "items": {
             "$ref": "#/definitions/VolcanoInfo"
           }
+        },
+        "singularities": {
+          "type": "array",
+          "description": "Add black/white-holes to this planet",
+          "items": {
+            "$ref": "#/definitions/SingularityModule"
+          }
         }
       }
     },
@@ -1451,6 +1454,62 @@
         }
       }
     },
+    "SingularityModule": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "curve": {
+          "type": "array",
+          "description": "Scale this module over time",
+          "items": {
+            "$ref": "#/definitions/TimeValuePair"
+          }
+        },
+        "makeZeroGVolume": {
+          "type": "boolean",
+          "description": "Only for White Holes. Should this white hole repel the player from it.",
+          "default": true
+        },
+        "pairedSingularity": {
+          "type": "string",
+          "description": "The uniqueID of the white hole or black hole that is paired to this one. If you don't set a value, entering will kill\nthe player"
+        },
+        "uniqueID": {
+          "type": "string",
+          "description": "The uniqueID of this white hole or black hole. If not set it will default to the name of the planet"
+        },
+        "position": {
+          "description": "Position of the singularity",
+          "$ref": "#/definitions/MVector3"
+        },
+        "size": {
+          "type": "number",
+          "description": "Radius of the singularity. Note that this isn't the same as the event horizon, but includes the entire volume that\nhas warped effects in it.",
+          "format": "float",
+          "minimum": 0.0
+        },
+        "targetStarSystem": {
+          "type": "string",
+          "description": "If you want a black hole to load a new star system scene, put its name here."
+        },
+        "type": {
+          "description": "Type of singularity (white hole or black hole)",
+          "$ref": "#/definitions/SingularityType"
+        }
+      }
+    },
+    "SingularityType": {
+      "type": "string",
+      "description": "",
+      "x-enumNames": [
+        "BlackHole",
+        "WhiteHole"
+      ],
+      "enum": [
+        "blackHole",
+        "whiteHole"
+      ]
+    },
     "ReferenceFrameModule": {
       "type": "object",
       "additionalProperties": false,
@@ -1729,58 +1788,6 @@
         }
       }
     },
-    "SingularityModule": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "curve": {
-          "type": "array",
-          "description": "Scale this module over time",
-          "items": {
-            "$ref": "#/definitions/TimeValuePair"
-          }
-        },
-        "makeZeroGVolume": {
-          "type": "boolean",
-          "description": "Only for White Holes. Should this white hole repel the player from it.",
-          "default": true
-        },
-        "pairedSingularity": {
-          "type": "string",
-          "description": "The name of the white hole or black hole that is paired to this one. If you don't set a value, entering will kill\nthe player"
-        },
-        "position": {
-          "description": "Position of the singularity",
-          "$ref": "#/definitions/MVector3"
-        },
-        "size": {
-          "type": "number",
-          "description": "Radius of the singularity. Note that this isn't the same as the event horizon, but includes the entire volume that\nhas warped effects in it.",
-          "format": "float",
-          "minimum": 0.0
-        },
-        "targetStarSystem": {
-          "type": "string",
-          "description": "If you want a black hole to load a new star system scene, put its name here."
-        },
-        "type": {
-          "description": "Type of singularity (white hole or black hole)",
-          "$ref": "#/definitions/SingularityType"
-        }
-      }
-    },
-    "SingularityType": {
-      "type": "string",
-      "description": "",
-      "x-enumNames": [
-        "BlackHole",
-        "WhiteHole"
-      ],
-      "enum": [
-        "blackHole",
-        "whiteHole"
-      ]
-    },
     "SpawnModule": {
       "type": "object",
       "additionalProperties": false,