diff --git a/models/ShipNav.json b/models/ShipNav.json
index 4250faf..c6aaf57 100644
--- a/models/ShipNav.json
+++ b/models/ShipNav.json
@@ -16,8 +16,8 @@
     "status": {
       "$ref": "./ShipNavStatus.json"
     },
-    "speed": {
-      "$ref": "./ShipNavSpeed.json"
+    "flightMode": {
+      "$ref": "./ShipNavFlightMode.json"
     }
   },
   "required": [
@@ -25,6 +25,6 @@
     "waypointSymbol",
     "route",
     "status",
-    "speed"
+    "flightMode"
   ]
 }
\ No newline at end of file
diff --git a/models/ShipNavSpeed.json b/models/ShipNavFlightMode.json
similarity index 57%
rename from models/ShipNavSpeed.json
rename to models/ShipNavFlightMode.json
index 0afac5d..39dee56 100644
--- a/models/ShipNavSpeed.json
+++ b/models/ShipNavFlightMode.json
@@ -1,6 +1,6 @@
 {
   "type": "string",
-  "description": "The ship's set speed when travelling between waypoints.",
+  "description": "The ship's set speed when traveling between waypoints or systems.",
   "enum": [
     "DRIFT",
     "STEALTH",
diff --git a/models/Shipyard.json b/models/Shipyard.json
index 9803aad..d63a7f9 100644
--- a/models/Shipyard.json
+++ b/models/Shipyard.json
@@ -7,6 +7,18 @@
       "description": "The symbol of the shipyard. The symbol is the same as the waypoint where the shipyard is located.",
       "minLength": 1
     },
+    "shipTypes": {
+      "type": "array",
+      "description": "The list of ship types available for purchase at this shipyard.",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "$ref": "./ShipType.json"
+          }
+        }
+      }
+    },
     "transactions": {
       "type": "array",
       "description": "The list of recent transactions at this shipyard.",
@@ -24,6 +36,6 @@
   },
   "required": [
     "symbol",
-    "ships"
+    "shipTypes"
   ]
 }
\ No newline at end of file