diff --git a/objects/submarine/definition.json b/objects/submarine/definition.json
index 3f59578..db326dd 100644
--- a/objects/submarine/definition.json
+++ b/objects/submarine/definition.json
@@ -1,8 +1,21 @@
 {
   "attributes": {
-    "class": {
-      "description": "Submarine class",
-      "misp-attribute": "text",
+    "active": {
+      "description": "The number of submarines of this class in active service",
+      "misp-attribute": "counter",
+      "ui-priority": 1
+    },
+    "armament": {
+      "description": "Armaments carried by the submarine",
+      "misp-attribute": "sha512/256",
+      "multiple": true,
+      "recommended": false,
+      "ui-priority": 0
+    },
+    "beam": {
+      "description": "The beam measurement of the submarine in meters",
+      "misp-attribute": "float",
+      "recommended": false,
       "ui-priority": 0
     },
     "builders": {
@@ -11,6 +24,44 @@
       "multiple": true,
       "ui-priority": 0
     },
+    "cancelled": {
+      "description": "The number of submarines of this class cancelled",
+      "misp-attribute": "counter",
+      "ui-priority": 1
+    },
+    "class": {
+      "description": "Submarine class",
+      "misp-attribute": "text",
+      "ui-priority": 0
+    },
+    "complement": {
+      "description": "Crew size",
+      "misp-attribute": "counter",
+      "recommended": false,
+      "ui-priority": 0
+    },
+    "completed": {
+      "description": "The number of submarines of this class built",
+      "misp-attribute": "counter",
+      "ui-priority": 1
+    },
+    "displacement": {
+      "description": "Displacement in tonns",
+      "misp-attribute": "counter",
+      "recommended": true,
+      "ui-priority": 0
+    },
+    "draught": {
+      "description": "The draught measurement of the submarine in meters",
+      "misp-attribute": "float",
+      "recommended": false,
+      "ui-priority": 0
+    },
+    "endurance": {
+      "description": "Expected submerged endurance in days",
+      "misp-attribute": "counter",
+      "ui-priority": 1
+    },
     "in_service_from": {
       "description": "The year the submarine entered service",
       "misp-attribute": "counter",
@@ -21,30 +72,11 @@
       "misp-attribute": "counter",
       "ui-priority": 0
     },
-    "planned": {
-      "description": "The number of submarines of this class planned to be built",
-      "misp-attribute": "counter",
-      "ui-priority": 1
-    },
-    "completed": {
-      "description": "The number of submarines of this class built",
-      "misp-attribute": "counter",
-      "ui-priority": 1
-    },
-    "cancelled": {
-      "description": "The number of submarines of this class cancelled",
-      "misp-attribute": "counter",
-      "ui-priority": 1
-    },
-    "active": {
-      "description": "The number of submarines of this class in active service",
-      "misp-attribute": "counter",
-      "ui-priority": 1
-    },
-    "retired": {
-      "description": "The number of submarines of this class that has been retired",
-      "misp-attribute": "counter",
-      "ui-priority": 1
+    "length": {
+      "description": "The length measurement of the submarine in meters",
+      "misp-attribute": "float",
+      "recommended": false,
+      "ui-priority": 0
     },
     "operator": {
       "description": "The countries operating such vessels (can be multiple)",
@@ -52,11 +84,38 @@
       "multiple": true,
       "ui-priority": 0
     },
+    "planned": {
+      "description": "The number of submarines of this class planned to be built",
+      "misp-attribute": "counter",
+      "ui-priority": 1
+    },
     "predecessor": {
       "description": "Predecessor class",
       "misp-attribute": "text",
       "ui-priority": 0
     },
+    "propulsion": {
+      "description": "The propulsion of the submarine, add multiple if applicabe",
+      "misp-attribute": "text",
+      "multiple": true,
+      "recommended": false,
+      "ui-priority": 0
+    },
+    "retired": {
+      "description": "The number of submarines of this class that has been retired",
+      "misp-attribute": "counter",
+      "ui-priority": 1
+    },
+    "speed_submerged": {
+      "description": "Surfaced top speed in knots",
+      "misp-attribute": "float",
+      "ui-priority": 1
+    },
+    "speed_surfaced": {
+      "description": "Surfaced top speed in knots",
+      "misp-attribute": "float",
+      "ui-priority": 1
+    },
     "successor": {
       "description": "Successor class",
       "misp-attribute": "text",
@@ -70,75 +129,15 @@
         "Ballistic missile submarine"
       ],
       "ui-priority": 0
-    },
-
-    "displacement": {
-      "description": "Displacement in tonns",
-      "misp-attribute": "counter",
-      "recommended": true,
-      "ui-priority": 0
-    },
-    "length": {
-      "description": "The length measurement of the submarine in meters",
-      "misp-attribute": "float",
-      "recommended": false,
-      "ui-priority": 0
-    },
-    "beam": {
-      "description": "The beam measurement of the submarine in meters",
-      "misp-attribute": "float",
-      "recommended": false,
-      "ui-priority": 0
-    },
-    "draught": {
-      "description": "The draught measurement of the submarine in meters",
-      "misp-attribute": "float",
-      "recommended": false,
-      "ui-priority": 0
-    },
-    "propulsion": {
-      "description": "The propulsion of the submarine, add multiple if applicabe",
-      "misp-attribute": "text",
-      "recommended": false,
-      "multiple": true,
-      "ui-priority": 0
-    },
-    "speed_surfaced": {
-      "description": "Surfaced top speed in knots",
-      "misp-attribute": "float",
-      "ui-priority": 1
-    },
-    "speed_submerged": {
-      "description": "Surfaced top speed in knots",
-      "misp-attribute": "float",
-      "ui-priority": 1
-    },
-    "endurance": {
-      "description": "Expected submerged endurance in days",
-      "misp-attribute": "counter",
-      "ui-priority": 1
-    },
-    "complement": {
-      "description": "Crew size",
-      "misp-attribute": "counter",
-      "recommended": false,
-      "ui-priority": 0
-    },
-    "armament": {
-      "description": "Armaments carried by the submarine",
-      "misp-attribute": "sha512/256",
-      "recommended": false,
-      "multiple": true,
-      "ui-priority": 0
     }
   },
   "description": "Submarine description",
   "meta-category": "naval",
   "name": "submarine",
   "required": [
-     "class",
-     "type"
+    "class",
+    "type"
   ],
   "uuid": "c8e0c039-0ada-486a-b446-2686709e1e28",
   "version": 1
-}
+}
\ No newline at end of file