diff --git a/edmc_data.py b/edmc_data.py
index ede9e6a7..c6c00f50 100644
--- a/edmc_data.py
+++ b/edmc_data.py
@@ -525,6 +525,8 @@ ship_name_map = {
     'viper_mkiv':                   'Viper MkIV',
     'vulture':                      'Vulture',
     'explorer_nx':                  'Caspian Explorer',
+    'SmallCombat01_NX':             'Kestrel Mk II',
+    'MediumTransport01':            'Lynx Highliner'
 }
 
 # Odyssey Suit Names
diff --git a/modules.json b/modules.json
index 8299592e..429bec39 100644
--- a/modules.json
+++ b/modules.json
@@ -3798,5 +3798,68 @@
     },
     "explorer_nx_armour_reactive": {
         "mass": 53
+    },
+    "SmallCombat01_NX_Armour_Grade1": {
+        "mass": 0
+    },
+    "SmallCombat01_NX_Armour_Grade2": {
+        "mass": 17
+    },
+    "SmallCombat01_NX_Armour_Grade3": {
+        "mass": 35
+    },
+    "SmallCombat01_NX_Armour_Mirrored": {
+        "mass": 35
+    },
+    "SmallCombat01_NX_Armour_Reactive": {
+        "mass": 35
+    },
+    "Hpt_MkIIPlasmaShockAutocannon_Fixed_Large": {
+        "mass": 8
+    },
+    "Int_MkIIAgileBoost_Engine_Size5_Class5": {
+        "mass": 20
+    },
+    "MediumTransport01_Armour_Grade1": {
+        "mass": 0
+    },
+    "MediumTransport01_Armour_Grade2": {
+        "mass": 26
+    },
+    "MediumTransport01_Armour_Grade3": {
+        "mass": 53
+    },
+    "MediumTransport01_Armour_Mirrored": {
+        "mass": 53
+    },
+    "MediumTransport01_Armour_Reactive": {
+        "mass": 53
+    },
+    "Int_MkII_PassengerCabin_Size2_Class1": {
+        "mass": 2.5
+    },
+    "Int_MkII_PassengerCabin_Size3_Class1": {
+        "mass": 5
+    },
+    "Int_MkII_PassengerCabin_Size3_Class2": {
+        "mass": 5
+    },
+    "Int_MkII_PassengerCabin_Size4_Class1": {
+        "mass": 10
+    },
+    "Int_MkII_PassengerCabin_Size4_Class2": {
+        "mass": 10
+    },
+    "Int_MkII_PassengerCabin_Size5_Class1": {
+        "mass": 20
+    },
+    "Int_MkII_PassengerCabin_Size5_Class2": {
+        "mass": 20
+    },
+    "Int_MkII_PassengerCabin_Size6_Class1": {
+        "mass": 40
+    },
+    "Int_MkII_PassengerCabin_Size6_Class2": {
+        "mass": 40
     }
 }
diff --git a/ships.json b/ships.json
index 77c01179..17b62e60 100644
--- a/ships.json
+++ b/ships.json
@@ -107,6 +107,10 @@
         "hullMass": 180,
         "reserveFuelCapacity": 0.39
     },
+    "Kestrel Mk II": {
+        "hullMass": 190,
+        "reserveFuelCapacity": 0.57
+    },
     "Krait MkII": {
         "hullMass": 320,
         "reserveFuelCapacity": 0.63
@@ -115,6 +119,10 @@
         "hullMass": 270,
         "reserveFuelCapacity": 0.63
     },
+    "Lynx Highliner": {
+        "hullMass": 260,
+        "reserveFuelCapacity": 0.61
+    },
     "Mamba": {
         "hullMass": 250,
         "reserveFuelCapacity": 0.5