diff --git a/modifications/blueprints.json b/modifications/blueprints.json
index 2dabe63..704123e 100644
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -1,5 +1,6 @@
 {
   "AFM_Shielded": {
+    "key": "AFM_Shielded",
     "fdname": "AFM_Shielded",
     "grades": {
       "1": {
@@ -98,6 +99,7 @@
     "name": "Shielded"
   },
   "Armour_Advanced": {
+    "key": "Armour_Advanced",
     "fdname": "Armour_Advanced",
     "grades": {
       "1": {
@@ -256,6 +258,7 @@
     "name": "Lightweight"
   },
   "Armour_Explosive": {
+    "key": "Armour_Explosive",
     "fdname": "Armour_Explosive",
     "grades": {
       "1": {
@@ -373,6 +376,7 @@
     "name": "Blast resistant"
   },
   "Armour_HeavyDuty": {
+    "key": "Armour_HeavyDuty",
     "fdname": "Armour_HeavyDuty",
     "grades": {
       "1": {
@@ -531,6 +535,7 @@
     "name": "Heavy duty"
   },
   "Armour_Kinetic": {
+    "key": "Armour_Kinetic",
     "fdname": "Armour_Kinetic",
     "grades": {
       "1": {
@@ -649,6 +654,7 @@
     "name": "Kinetic resistant"
   },
   "Armour_Thermic": {
+    "key": "Armour_Thermic",
     "fdname": "Armour_Thermic",
     "grades": {
       "1": {
@@ -767,6 +773,7 @@
     "name": "Thermal resistant"
   },
   "Misc_LightWeight": {
+    "key": "Misc_LightWeight",
     "fdname": "Misc_LightWeight",
     "grades": {
       "1": {
@@ -874,6 +881,7 @@
     "name": "Lightweight"
   },
   "Misc_Reinforced": {
+    "key": "Misc_Reinforced",
     "fdname": "Misc_Reinforced",
     "grades": {
       "1": {
@@ -981,6 +989,7 @@
     "name": "Reinforced"
   },
   "Misc_Shielded": {
+    "key": "Misc_Shielded",
     "fdname": "Misc_Shielded",
     "grades": {
       "1": {
@@ -1088,6 +1097,7 @@
     "name": "Shielded"
   },
   "Misc_ChaffCapacity": {
+    "key": "Misc_ChaffCapacity",
     "fdname": "Misc_ChaffCapacity",
     "grades": {
       "1": {
@@ -1120,6 +1130,7 @@
     "name": "Ammo capacity"
   },
   "CollectionLimpet_LightWeight": {
+    "key": "CollectionLimpet_LightWeight",
     "fdname": "CollectionLimpet_LightWeight",
     "grades": {
       "1": {
@@ -1217,6 +1228,7 @@
     "name": "Lightweight"
   },
   "CollectionLimpet_Reinforced": {
+    "key": "CollectionLimpet_Reinforced",
     "fdname": "CollectionLimpet_Reinforced",
     "grades": {
       "1": {
@@ -1314,6 +1326,7 @@
     "name": "Reinforced"
   },
   "CollectionLimpet_Shielded": {
+    "key": "CollectionLimpet_Shielded",
     "fdname": "CollectionLimpet_Shielded",
     "grades": {
       "1": {
@@ -1411,6 +1424,7 @@
     "name": "Shielded"
   },
   "Engine_Dirty": {
+    "key": "Engine_Dirty",
     "fdname": "Engine_Dirty",
     "grades": {
       "1": {
@@ -1569,6 +1583,7 @@
     "name": "Dirty"
   },
   "Engine_Reinforced": {
+    "key": "Engine_Reinforced",
     "fdname": "Engine_Reinforced",
     "grades": {
       "1": {
@@ -1687,6 +1702,7 @@
     "name": "Reinforced"
   },
   "Engine_Tuned": {
+    "key": "Engine_Tuned",
     "fdname": "Engine_Tuned",
     "grades": {
       "1": {
@@ -1837,6 +1853,7 @@
     "name": "Clean"
   },
   "FSD_FastBoot": {
+    "key": "FSD_FastBoot",
     "fdname": "FSD_FastBoot",
     "grades": {
       "1": {
@@ -1975,6 +1992,7 @@
     "name": "Faster boot sequence"
   },
   "FSD_LongRange": {
+    "key": "FSD_LongRange",
     "fdname": "FSD_LongRange",
     "grades": {
       "1": {
@@ -2113,6 +2131,7 @@
     "name": "Increased range"
   },
   "FSD_Shielded": {
+    "key": "FSD_Shielded",
     "fdname": "FSD_Shielded",
     "grades": {
       "1": {
@@ -2251,6 +2270,7 @@
     "name": "Shielded"
   },
   "FSDinterdictor_Expanded": {
+    "key": "FSDinterdictor_Expanded",
     "fdname": "FSDinterdictor_Expanded",
     "grades": {
       "1": {
@@ -2347,6 +2367,7 @@
     "name": "Expanded capture arc"
   },
   "FSDinterdictor_LongRange": {
+    "key": "FSDinterdictor_LongRange",
     "fdname": "FSDinterdictor_LongRange",
     "grades": {
       "1": {
@@ -2485,6 +2506,7 @@
     "name": "Long range"
   },
   "FuelScoop_Shielded": {
+    "key": "FuelScoop_Shielded",
     "fdname": "FuelScoop_Shielded",
     "grades": {
       "1": {
@@ -2582,6 +2604,7 @@
     "name": "Shielded"
   },
   "FuelTransferLimpet_LightWeight": {
+    "key": "FuelTransferLimpet_LightWeight",
     "fdname": "FuelTransferLimpet_LightWeight",
     "grades": {
       "1": {
@@ -2679,6 +2702,7 @@
     "name": "Lightweight"
   },
   "FuelTransferLimpet_Reinforced": {
+    "key": "FuelTransferLimpet_Reinforced",
     "fdname": "FuelTransferLimpet_Reinforced",
     "grades": {
       "1": {
@@ -2776,6 +2800,7 @@
     "name": "Reinforced"
   },
   "FuelTransferLimpet_Shielded": {
+    "key": "FuelTransferLimpet_Shielded",
     "fdname": "FuelTransferLimpet_Shielded",
     "grades": {
       "1": {
@@ -2873,6 +2898,7 @@
     "name": "Shielded"
   },
   "HatchBreakerLimpet_LightWeight": {
+    "key": "HatchBreakerLimpet_LightWeight",
     "fdname": "HatchBreakerLimpet_LightWeight",
     "grades": {
       "1": {
@@ -2970,6 +2996,7 @@
     "name": "Lightweight"
   },
   "HatchBreakerLimpet_Reinforced": {
+    "key": "HatchBreakerLimpet_Reinforced",
     "fdname": "HatchBreakerLimpet_Reinforced",
     "grades": {
       "1": {
@@ -3067,6 +3094,7 @@
     "name": "Reinforced"
   },
   "HatchBreakerLimpet_Shielded": {
+    "key": "HatchBreakerLimpet_Shielded",
     "fdname": "HatchBreakerLimpet_Shielded",
     "grades": {
       "1": {
@@ -3164,6 +3192,7 @@
     "name": "Shielded"
   },
   "Misc_HeatSinkCapacity": {
+    "key": "Misc_HeatSinkCapacity",
     "fdname": "Misc_HeatSinkCapacity",
     "grades": {
       "1": {
@@ -3196,6 +3225,7 @@
     "name": "Ammo capacity"
   },
   "HullReinforcement_Advanced": {
+    "key": "HullReinforcement_Advanced",
     "fdname": "HullReinforcement_Advanced",
     "grades": {
       "1": {
@@ -3315,6 +3345,7 @@
     "name": "Lightweight"
   },
   "HullReinforcement_Explosive": {
+    "key": "HullReinforcement_Explosive",
     "fdname": "HullReinforcement_Explosive",
     "grades": {
       "1": {
@@ -3454,6 +3485,7 @@
     "name": "Blast resistant"
   },
   "HullReinforcement_HeavyDuty": {
+    "key": "HullReinforcement_HeavyDuty",
     "fdname": "HullReinforcement_HeavyDuty",
     "grades": {
       "1": {
@@ -3613,6 +3645,7 @@
     "name": "Heavy duty"
   },
   "HullReinforcement_Kinetic": {
+    "key": "HullReinforcement_Kinetic",
     "fdname": "HullReinforcement_Kinetic",
     "grades": {
       "1": {
@@ -3752,6 +3785,7 @@
     "name": "Kinetic resistant"
   },
   "HullReinforcement_Thermic": {
+    "key": "HullReinforcement_Thermic",
     "fdname": "HullReinforcement_Thermic",
     "grades": {
       "1": {
@@ -3891,6 +3925,7 @@
     "name": "Thermal resistant"
   },
   "LifeSupport_LightWeight": {
+    "key": "LifeSupport_LightWeight",
     "fdname": "LifeSupport_LightWeight",
     "grades": {
       "1": {
@@ -3988,6 +4023,7 @@
     "name": "Lightweight"
   },
   "LifeSupport_Reinforced": {
+    "key": "LifeSupport_Reinforced",
     "fdname": "LifeSupport_Reinforced",
     "grades": {
       "1": {
@@ -4085,6 +4121,7 @@
     "name": "Reinforced"
   },
   "LifeSupport_Shielded": {
+    "key": "LifeSupport_Shielded",
     "fdname": "LifeSupport_Shielded",
     "grades": {
       "1": {
@@ -4182,6 +4219,7 @@
     "name": "Shielded"
   },
   "Misc_PointDefenseCapacity": {
+    "key": "Misc_PointDefenseCapacity",
     "fdname": "Misc_PointDefenseCapacity",
     "grades": {
       "1": {
@@ -4214,6 +4252,7 @@
     "name": "Ammo capacity"
   },
   "PowerDistributor_HighCapacity": {
+    "key": "PowerDistributor_HighCapacity",
     "fdname": "PowerDistributor_HighCapacity",
     "grades": {
       "1": {
@@ -4412,6 +4451,7 @@
     "name": "High charge capacity"
   },
   "PowerDistributor_HighFrequency": {
+    "key": "PowerDistributor_HighFrequency",
     "fdname": "PowerDistributor_HighFrequency",
     "grades": {
       "1": {
@@ -4590,6 +4630,7 @@
     "name": "Charge enhanced"
   },
   "PowerDistributor_PriorityEngines": {
+    "key": "PowerDistributor_PriorityEngines",
     "fdname": "PowerDistributor_PriorityEngines",
     "grades": {
       "1": {
@@ -4768,6 +4809,7 @@
     "name": "Engine focused"
   },
   "PowerDistributor_PrioritySystems": {
+    "key": "PowerDistributor_PrioritySystems",
     "fdname": "PowerDistributor_PrioritySystems",
     "grades": {
       "1": {
@@ -4946,6 +4988,7 @@
     "name": "System focused"
   },
   "PowerDistributor_PriorityWeapons": {
+    "key": "PowerDistributor_PriorityWeapons",
     "fdname": "PowerDistributor_PriorityWeapons",
     "grades": {
       "1": {
@@ -5124,6 +5167,7 @@
     "name": "Weapon focused"
   },
   "PowerDistributor_Shielded": {
+    "key": "PowerDistributor_Shielded",
     "fdname": "PowerDistributor_Shielded",
     "grades": {
       "1": {
@@ -5242,6 +5286,7 @@
     "name": "Shielded"
   },
   "PowerPlant_Armoured": {
+    "key": "PowerPlant_Armoured",
     "fdname": "PowerPlant_Armoured",
     "grades": {
       "1": {
@@ -5379,6 +5424,7 @@
     "name": "Armoured"
   },
   "PowerPlant_Boosted": {
+    "key": "PowerPlant_Boosted",
     "fdname": "PowerPlant_Boosted",
     "grades": {
       "1": {
@@ -5496,6 +5542,7 @@
     "name": "Overcharged"
   },
   "PowerPlant_Stealth": {
+    "key": "PowerPlant_Stealth",
     "fdname": "PowerPlant_Stealth",
     "grades": {
       "1": {
@@ -5613,6 +5660,7 @@
     "name": "Low emissions"
   },
   "ProspectingLimpet_LightWeight": {
+    "key": "ProspectingLimpet_LightWeight",
     "fdname": "ProspectingLimpet_LightWeight",
     "grades": {
       "1": {
@@ -5710,6 +5758,7 @@
     "name": "Lightweight"
   },
   "ProspectingLimpet_Reinforced": {
+    "key": "ProspectingLimpet_Reinforced",
     "fdname": "ProspectingLimpet_Reinforced",
     "grades": {
       "1": {
@@ -5807,6 +5856,7 @@
     "name": "Reinforced"
   },
   "ProspectingLimpet_Shielded": {
+    "key": "ProspectingLimpet_Shielded",
     "fdname": "ProspectingLimpet_Shielded",
     "grades": {
       "1": {
@@ -5904,6 +5954,7 @@
     "name": "Shielded"
   },
   "Refineries_Shielded": {
+    "key": "Refineries_Shielded",
     "fdname": "Refineries_Shielded",
     "grades": {
       "1": {
@@ -6001,6 +6052,7 @@
     "name": "Shielded"
   },
   "Sensor_FastScan": {
+    "key": "Sensor_FastScan",
     "fdname": "Sensor_FastScan",
     "grades": {
       "1": {
@@ -6123,7 +6175,8 @@
     "name": "Fast scan"
   },
   "Scanner_LongRange": {
-    "fdname": "Scanner_LongRange",
+    "key": "Scanner_LongRange",
+    "fdname": "Sensor_LongRange",
     "grades": {
       "1": {
         "components": {
@@ -6245,7 +6298,8 @@
     "name": "Long range"
   },
   "Scanner_WideAngle": {
-    "fdname": "Scanner_WideAngle",
+    "key": "Scanner_WideAngle",
+    "fdname": "Sensor_WideAngle",
     "grades": {
       "1": {
         "components": {
@@ -6367,6 +6421,7 @@
     "name": "Wide angle"
   },
   "Sensor_LightWeight": {
+    "key": "Sensor_LightWeight",
     "fdname": "Sensor_LightWeight",
     "grades": {
       "1": {
@@ -6484,6 +6539,7 @@
     "name": "Lightweight"
   },
   "Sensor_LongRange": {
+    "key": "Sensor_LongRange",
     "fdname": "Sensor_LongRange",
     "grades": {
       "1": {
@@ -6601,6 +6657,7 @@
     "name": "Long range"
   },
   "Sensor_WideAngle": {
+    "key": "Sensor_WideAngle",
     "fdname": "Sensor_WideAngle",
     "grades": {
       "1": {
@@ -6718,6 +6775,7 @@
     "name": "Wide angle"
   },
   "Sensor_Expanded": {
+    "key": "Sensor_Expanded",
     "fdname": "Sensor_Expanded",
     "grades": {
       "1": {
@@ -6816,6 +6874,7 @@
     "name": "Expanded Probe Scanning Radius"
   },
   "ShieldBooster_Explosive": {
+    "key": "ShieldBooster_Explosive",
     "fdname": "ShieldBooster_Explosive",
     "grades": {
       "1": {
@@ -6933,6 +6992,7 @@
     "name": "Blast resistant"
   },
   "ShieldBooster_HeavyDuty": {
+    "key": "ShieldBooster_HeavyDuty",
     "fdname": "ShieldBooster_HeavyDuty",
     "grades": {
       "1": {
@@ -7070,6 +7130,7 @@
     "name": "Heavy duty"
   },
   "ShieldBooster_Kinetic": {
+    "key": "ShieldBooster_Kinetic",
     "fdname": "ShieldBooster_Kinetic",
     "grades": {
       "1": {
@@ -7187,6 +7248,7 @@
     "name": "Kinetic resistant"
   },
   "ShieldBooster_Resistive": {
+    "key": "ShieldBooster_Resistive",
     "fdname": "ShieldBooster_Resistive",
     "grades": {
       "1": {
@@ -7344,6 +7406,7 @@
     "name": "Resistance augmented"
   },
   "ShieldBooster_Thermic": {
+    "key": "ShieldBooster_Thermic",
     "fdname": "ShieldBooster_Thermic",
     "grades": {
       "1": {
@@ -7461,6 +7524,7 @@
     "name": "Thermal resistant"
   },
   "ShieldCellBank_Rapid": {
+    "key": "ShieldCellBank_Rapid",
     "fdname": "ShieldCellBank_Rapid",
     "grades": {
       "1": {
@@ -7573,6 +7637,7 @@
     "name": "Rapid charge"
   },
   "ShieldCellBank_Specialised": {
+    "key": "ShieldCellBank_Specialised",
     "fdname": "ShieldCellBank_Specialised",
     "grades": {
       "1": {
@@ -7701,6 +7766,7 @@
     "name": "Specialised"
   },
   "ShieldGenerator_Kinetic": {
+    "key": "ShieldGenerator_Kinetic",
     "fdname": "ShieldGenerator_Kinetic",
     "grades": {
       "1": {
@@ -7819,6 +7885,7 @@
     "name": "Kinetic resistant"
   },
   "ShieldGenerator_Optimised": {
+    "key": "ShieldGenerator_Optimised",
     "fdname": "ShieldGenerator_Optimised",
     "grades": {
       "1": {
@@ -7977,6 +8044,7 @@
     "name": "Enhanced low power"
   },
   "ShieldGenerator_Reinforced": {
+    "key": "ShieldGenerator_Reinforced",
     "fdname": "ShieldGenerator_Reinforced",
     "grades": {
       "1": {
@@ -8155,6 +8223,7 @@
     "name": "Reinforced"
   },
   "ShieldGenerator_Thermic": {
+    "key": "ShieldGenerator_Thermic",
     "fdname": "ShieldGenerator_Thermic",
     "grades": {
       "1": {
@@ -8273,6 +8342,7 @@
     "name": "Thermal resistant"
   },
   "Weapon_DoubleShot": {
+    "key": "Weapon_DoubleShot",
     "fdname": "Weapon_DoubleShot",
     "grades": {
       "1": {
@@ -8410,6 +8480,7 @@
     "name": "Double shot"
   },
   "Weapon_Efficient": {
+    "key": "Weapon_Efficient",
     "fdname": "Weapon_Efficient",
     "grades": {
       "1": {
@@ -8539,6 +8610,7 @@
     "name": "Efficient"
   },
   "Weapon_Focused": {
+    "key": "Weapon_Focused",
     "fdname": "Weapon_Focused",
     "grades": {
       "1": {
@@ -8696,6 +8768,7 @@
     "name": "Focused"
   },
   "Weapon_HighCapacity": {
+    "key": "Weapon_HighCapacity",
     "fdname": "Weapon_HighCapacity",
     "grades": {
       "1": {
@@ -8853,6 +8926,7 @@
     "name": "High capacity"
   },
   "Weapon_LightWeight": {
+    "key": "Weapon_LightWeight",
     "fdname": "Weapon_LightWeight",
     "grades": {
       "1": {
@@ -8982,6 +9056,7 @@
     "name": "Lightweight"
   },
   "Weapon_LongRange": {
+    "key": "Weapon_LongRange",
     "fdname": "Weapon_LongRange",
     "grades": {
       "1": {
@@ -9139,7 +9214,8 @@
     "name": "Long range"
   },
   "MC_Overcharged": {
-    "fdname": "MC_Overcharged",
+    "key": "MC_Overcharged",
+    "fdname": "Weapon_Overcharged",
     "grades": {
       "1": {
         "components": {
@@ -9276,6 +9352,7 @@
     "name": "Overcharged"
   },
   "Weapon_Overcharged": {
+    "key": "Weapon_Overcharged",
     "fdname": "Weapon_Overcharged",
     "grades": {
       "1": {
@@ -9393,6 +9470,7 @@
     "name": "Overcharged"
   },
   "Weapon_RapidFire": {
+    "key": "Weapon_RapidFire",
     "fdname": "Weapon_RapidFire",
     "grades": {
       "1": {
@@ -9546,6 +9624,7 @@
     "name": "Rapid fire"
   },
   "Weapon_ShortRange": {
+    "key": "Weapon_ShortRange",
     "fdname": "Weapon_ShortRange",
     "grades": {
       "1": {
@@ -9659,6 +9738,7 @@
     "name": "Short range"
   },
   "Weapon_Sturdy": {
+    "key": "Weapon_Sturdy",
     "fdname": "Weapon_Sturdy",
     "grades": {
       "1": {