diff --git a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
index 32ab637a091e203badf9f167ee863644f303ac7d..70ded2d2d53476a7f07dcd5378ec4ecb5370bbac 100644
--- a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
@@ -1,26 +1,26 @@
-HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , doubledecker , vehicle code , low entry , DesignSpeed , Body , .vacc file , Cross Wind Correction , CdxA Standard , AxlesWeights        , Width , Length , Body Height , entrance height , CurbMass , PassengersLowerDeck , PassengersUpperDeck , Heavy Urban , Urban , Suburban , Interurban , Coach , ES_External displays , ES_Internal displays , ES_Fridge , ES_Kitchen Standard , HVAC System Configuration , HVAC Compressor type , HVAC Aux Heater , HVAC Double Glasing , HVAC Heatpump , HVAC Adjustable AuxiliaryHeater , HVAC SeparateAirDistributionDucts
+HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , doubledecker , vehicle code , low entry , floor type , DesignSpeed , Body , .vacc file , Cross Wind Correction , CdxA Standard , AxlesWeights        , Width , Length , Body Height , entrance height , CurbMass , PassengersLowerDeck , PassengersUpperDeck , Heavy Urban , Urban , Suburban , Interurban , Coach , ES_External displays , ES_Internal displays , ES_Fridge , ES_Kitchen Standard , HVAC System Configuration , HVAC Compressor type , HVAC Aux Heater , HVAC Double Glasing , HVAC Heatpump , HVAC Adjustable AuxiliaryHeater , HVAC SeparateAirDistributionDucts
 ## Heavy Bus Primary Vehicles
-P31SD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 0            , CE           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 4.9           , 37.5/62.5           , 2.55  , 12     , 2.8         , 340             , 11975    , 80                  , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 2                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P31DD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 1            , CF           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 6.2           , 37.5/62.5           , 2.55  , 10.5   , 3.8         , 340             , 12350    , 60                  , 40                  , 3.7         , 3.7   , 3.7      ,            ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P32SD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 0            , CA           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.45          , 37.5/62.5           , 2.55  , 12     , 3.15        , 340             , 13150    , 45                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   , 2                    , 2                    , 0.5       , 0.5                 , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
-P32DD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 1            , CB           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.9           , 37.5/62.5           , 2.55  , 10.5   , 3.7         , 340             , 13400    , 25                  , 35                  ,             ,       ,          , 3/2.5      , 2     , 1                    , 2                    , 1         , 1                   , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P31SD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 0            , CE           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 4.9           , 37.5/62.5           , 2.55  , 12     , 2.8         , 340             , 11975    , 80                  , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 2                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P31DD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 1            , CF           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 6.2           , 37.5/62.5           , 2.55  , 10.5   , 3.8         , 340             , 12350    , 60                  , 40                  , 3.7         , 3.7   , 3.7      ,            ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P32SD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 0            , CA           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.45          , 37.5/62.5           , 2.55  , 12     , 3.15        , 340             , 13150    , 45                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   , 2                    , 2                    , 0.5       , 0.5                 , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P32DD     , 1                , HeavyBus         , P31_32         , -           , 2         , 7.4       , 999       , 1            , CB           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.9           , 37.5/62.5           , 2.55  , 10.5   , 3.7         , 340             , 13400    , 25                  , 35                  ,             ,       ,          , 3/2.5      , 2     , 1                    , 2                    , 1         , 1                   , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
 ##
-P33SD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 0            , CE           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 5.0           , 27.3/45.4/27.3      , 2.55  , 14.2   , 2.8         , 340             , 14175    , 104                 , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 2                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P33DD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 1            , CF           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 6.3           , 27.3/45.4/27.3      , 2.55  , 13.5   , 3.8         , 340             , 14725    , 78                  , 52                  , 3.7         , 3.7   , 3.7      ,            ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P34SD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 0            , CA           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.53          , 27.3/45.4/27.3      , 2.55  , 13.8   , 3.15        , 340             , 15213    , 59                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   , 2                    , 2                    , 0.5       , 0.5                 , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
-P34DD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 1            , CB           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.98          , 27.3/45.4/27.3      , 2.55  , 14     , 3.7         , 340             , 17850    , 33                  , 46                  ,             ,       ,          , 3/2.5      , 2     , 1                    , 4                    , 1         , 1.5                 , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P33SD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 0            , CE           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 5.0           , 27.3/45.4/27.3      , 2.55  , 14.2   , 2.8         , 340             , 14175    , 104                 , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 2                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P33DD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 1            , CF           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 6.3           , 27.3/45.4/27.3      , 2.55  , 13.5   , 3.8         , 340             , 14725    , 78                  , 52                  , 3.7         , 3.7   , 3.7      ,            ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P34SD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 0            , CA           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.53          , 27.3/45.4/27.3      , 2.55  , 13.8   , 3.15        , 340             , 15213    , 59                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   , 2                    , 2                    , 0.5       , 0.5                 , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P34DD     , 1                , HeavyBus         , P33_34         , 0           , 3         , 7.4       , 999       , 1            , CB           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.98          , 27.3/45.4/27.3      , 2.55  , 14     , 3.7         , 340             , 17850    , 33                  , 46                  ,             ,       ,          , 3/2.5      , 2     , 1                    , 4                    , 1         , 1.5                 , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
 #
-P35SD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 0            , CG           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 5.1           , 24.3/35.2/40.5      , 2.55  , 18.2   , 2.8         , 340             , 17800    , 104                 , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P35DD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 1            , CH           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 6.4           , 24.3/35.2/40.5      , 2.55  , 18.2   , 3.8         , 340             , 20250    , 78                  , 52                  , 3.7         , 3.7   , 3.7      ,            ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P36SD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 0            , CC           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.60          , 24.3/35.2/40.5      , 2.55  , 18.2   , 3.15        , 340             , 19267    , 59                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
-P36DD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 1            , CD           , -         , 100         ,      , Bus.vacc   , CoachBus              , 4.05          , 24.3/35.2/40.5      , 2.55  , 18.2   , 3.7         , 340             , 21375    , 33                  , 46                  ,             ,       ,          , 3/2.5      , 2     ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P35SD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 0            , CG           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 5.1           , 24.3/35.2/40.5      , 2.55  , 18.2   , 2.8         , 340             , 17800    , 104                 , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P35DD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 1            , CH           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 6.4           , 24.3/35.2/40.5      , 2.55  , 18.2   , 3.8         , 340             , 20250    , 78                  , 52                  , 3.7         , 3.7   , 3.7      ,            ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P36SD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 0            , CC           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.60          , 24.3/35.2/40.5      , 2.55  , 18.2   , 3.15        , 340             , 19267    , 59                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P36DD     , 1                , HeavyBus         , P35_36         , 1           , 3         , 7.4       , 999       , 1            , CD           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 4.05          , 24.3/35.2/40.5      , 2.55  , 18.2   , 3.7         , 340             , 21375    , 33                  , 46                  ,             ,       ,          , 3/2.5      , 2     ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
 ##        
-P37SD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 0            , CE           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 5.1           , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 2.8         , 340             , 15000    , 125                 , 0                   , 3           , 3     , 3        , 1.8        ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P37DD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 1            , CF           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 6.4           , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 3.8         , 340             , 18700    , 94                  , 62                  , 3.7         , 3.7   , 3.7      ,            ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P38SD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 0            , CA           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.60          , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 3.15        , 340             , 17500    , 70                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
-P38DD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 1            , CB           , -         , 100         ,      , Bus.vacc   , CoachBus              , 4.05          , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 3.7         , 340             , 21200    , 39                  , 55                  ,             ,       ,          , 3/2.5      , 2     ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P37SD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 0            , CE           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 5.1           , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 2.8         , 340             , 15000    , 125                 , 0                   , 3           , 3     , 3        , 1.8        ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P37DD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 1            , CF           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 6.4           , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 3.8         , 340             , 18700    , 94                  , 62                  , 3.7         , 3.7   , 3.7      ,            ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P38SD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 0            , CA           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.60          , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 3.15        , 340             , 17500    , 70                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P38DD     , 1                , HeavyBus         , P37_38         , 0           , 4         , 7.4       , 999       , 1            , CB           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 4.05          , 21.4/21.4/35.8/21.4 , 2.55  , 15     , 3.7         , 340             , 21200    , 39                  , 55                  ,             ,       ,          , 3/2.5      , 2     ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
 #
-P39SD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 0            , CG           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 5.2           , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 2.6         , 340             , 19600    , 125                 , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P39DD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 1            , CH           , 0         , 100         ,      , Bus.vacc   , CoachBus              , 6.5           , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 3.8         , 340             , 24800    , 94                  , 62                  , 3.7         , 3.7   , 3.7      ,            ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
-P40SD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 0            , CC           , -         , 100         ,      , Bus.vacc   , CoachBus              , 3.68          , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 3.15        , 340             , 20950    , 70                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
-P40DD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 1            , CD           , -         , 100         ,      , Bus.vacc   , CoachBus              , 4.13          , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 3.7         , 340             , 24600    , 39                  , 55                  ,             ,       ,          , 3/2.5      , 2     ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P39SD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 0            , CG           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 5.2           , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 2.6         , 340             , 19600    , 125                 , 0                   , 3           , 3     , 3        , 1.8        ,       , 3                    , 3                    , 0         , 0                   , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P39DD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 1            , CH           , 0         , low floor  , 100         ,      , Bus.vacc   , CoachBus              , 6.5           , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 3.8         , 340             , 24800    , 94                  , 62                  , 3.7         , 3.7   , 3.7      ,            ,       ,                      ,                      ,           ,                     , 6                         , 2-stage              , 15              , 0                   , 0             , 0                               , 0
+P40SD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 0            , CC           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 3.68          , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 3.15        , 340             , 20950    , 70                  , 0                   ,             ,       ,          , 2.2/1.8    , 1.4   ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1
+P40DD     , 1                , HeavyBus         , P39_40         , 1           , 4         , 7.4       , 999       , 1            , CD           , -         , high floor , 100         ,      , Bus.vacc   , CoachBus              , 4.13          , 20.0/28.2/32.4/19.4 , 2.55  , 21     , 3.7         , 340             , 24600    , 39                  , 55                  ,             ,       ,          , 3/2.5      , 2     ,                      ,                      ,           ,                     , 6                         , 2-stage              , 30              , 1                   , 0             , 0                               , 1