diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv
index 7ea13e6650e083af87b6fe8cb67d354a2d679272..93b5fd09015a4fabe1af46677226f47e054d4f19 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv
@@ -1,2 +1,2 @@
-Technology         ,Long haul,Regional delivery,Urban delivery,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach
-Standard alternator,0.7      ,0.7              ,0.7           ,0.7              ,0.7         ,1          ,1    ,1       ,1         ,1    
\ No newline at end of file
+Technology         ,Long haul,Regional delivery,Urban delivery,Municipal utility,Construction
+Standard alternator efficiency,0.7      ,0.7              ,0.7           ,0.7              ,0.7
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
index 889a1bff6283a3dd9916e819ae666224e286b03a..93962b78bbd055128725016421f4585e976ee00c 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
@@ -1,11 +1,11 @@
 HDV Class,Long haul,Regional delivery,Urban delivery,Municipal utility,Construction
-1,0,150,150,0,0
-2,200,200,150,0,0
-3,0,200,150,0,0
-4,350,200,0,300,0
-5,350,200,0,0,0
-9,350,200,0,300,0
-10,350,200,0,0,0
-11,350,200,0,300,200
-12,350,200,0,0,200
-16,0,0,0,0,200
+1,,150,150,,
+2,200,200,150,,
+3,,200,150,,
+4,350,200,,300,
+5,350,200,,,
+9,350,200,,300,
+10,350,200,,,
+11,350,200,,300,200
+12,350,200,,,200
+16,,,,,200
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv
index cfbb35d7d3419cd95deb26a7da171ac279823eb3..916cf5a81a11dbad8fac464eb74e0b6622a58bf4 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv
@@ -1,13 +1,29 @@
-HDV Class / Power,Long haul,Regional delivery,Urban delivery,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach
-1,0.0,1300.0,1240.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,1180.0,1280.0,1320.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-3,0.0,1360.0,1380.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-4,1300.0,1340.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-5,1340.0,1820.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-6,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-7,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-8,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-9,1340.0,1540.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-10,1340.0,1820.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-12,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+Technology,Long Haul,Regional Delivery,Urban  Delivery,Municipal utility,Construction
+Small,1400,1300,1200,1200,1300
+Small + ESS,900,800,800,800,800
+Small + visco clutch,800,700,700,700,700
+Small + mech. clutch,600,600,650,650,600
+Small + ESS + AMS,500,400,500,500,400
+Small + visco clutch + AMS,400,300,400,400,300
+Small + mech. clutch + AMS,200,200,350,350,200
+Medium Supply 1-stage,1600,1400,1350,1350,1500
+Medium Supply 1-stage + ESS,1000,900,900,900,900
+Medium Supply 1-stage + visco clutch,850,800,800,800,750
+Medium Supply 1-stage + mech. clutch,600,550,550,550,600
+Medium Supply 1-stage + ESS + AMS,600,700,700,700,500
+Medium Supply 1-stage + visco clutch + AMS,450,600,600,600,350
+Medium Supply 1-stage + mech. clutch + AMS,200,350,350,350,200
+Medium Supply 2-stage,2100,1750,1700,1700,2100
+Medium Supply 2-stage + ESS,1100,1050,1000,1000,1000
+Medium Supply 2-stage + visco clutch,1000,850,800,800,900
+Medium Supply 2-stage + mech. clutch,700,650,600,600,800
+Medium Supply 2-stage + ESS + AMS,700,850,800,800,500
+Medium Supply 2-stage + visco clutch + AMS,600,650,600,600,400
+Medium Supply 2-stage + mech. clutch + AMS,300,450,400,400,300
+Large Supply,4300,3600,3500,3500,4100
+Large Supply + ESS,1600,1300,1200,1200,1500
+Large Supply + visco clutch,1300,1100,1000,1000,1200
+Large Supply + mech. clutch,800,800,700,700,900
+Large Supply + ESS + AMS,1100,1000,1000,1000,1000
+Large Supply + visco clutch + AMS,800,800,800,800,700
+Large Supply + mech. clutch + AMS,300,500,500,500,400