diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
index 442ca7176a4c1075b6fd1520c175ba398f66e299..3a410bcf93db2209e5fd55f38ba9f5c5c18f0260 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Michael Krisper (Technische Universität Graz) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -15,7 +15,10 @@ Changelog:
     12.04.2022: Remove TorqueLimits element on vehicle level for PEV, HEV-S, HEV-IEPC-S
                 Remove BoostingLimitations for HEV-IEPC-S
 	14.04.2022: Added new RetarderTypeType definition to cover AxlegearInputRetarder (used only for E3, S3, S-IEPC, E-IEPC)
-	17.08.2022 Changed datatype of ChassisConfiguration, AxleConfiguration and LegislativeCategory for Vehicle_Exempted_MediumLorryDeclarationType-->
+	17.08.2022: Changed datatype of ChassisConfiguration, AxleConfiguration and LegislativeCategory for Vehicle_Exempted_MediumLorryDeclarationType
+	16.11.2022: 	- Removed trailing white spaces from PSTechnologies and SPTechnologies
+				- changed Small + elec. driven + ESS to Small + AMS + elec. driven	
+	-->
 	<xs:complexType name="Abstract_ADAS_ConventionalType" abstract="true">
 		<xs:complexContent>
 			<xs:extension base="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
@@ -2514,9 +2517,9 @@ Changelog:
 	<xs:simpleType name="AuxPSTechnology_PEV_LorryType">
 		<xs:restriction base="v2.4:AuxPSTechnologyLorryType">
 			<xs:enumeration value="Small + elec. driven"/>
-			<xs:enumeration value="Small + ESS + elec. driven "/>
+			<xs:enumeration value="Small + AMS + elec. driven"/>
 			<xs:enumeration value="Medium Supply 1-stage + elec. driven"/>
-			<xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven "/>
+			<xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven"/>
 			<xs:enumeration value="Medium Supply 2-stage + elec. driven"/>
 			<xs:enumeration value="Medium Supply 2-stage + AMS + elec. driven"/>
 			<xs:enumeration value="Large Supply + elec. driven"/>
@@ -2529,37 +2532,38 @@ Changelog:
 			<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
 			<xs:enumeration value="Small"/>
 			<xs:enumeration value="Small + ESS"/>
-			<xs:enumeration value="Small + visco clutch "/>
+			<xs:enumeration value="Small + visco clutch"/>
 			<xs:enumeration value="Small + mech. clutch"/>
 			<xs:enumeration value="Small + ESS + AMS"/>
 			<xs:enumeration value="Small + visco clutch + AMS"/>
 			<xs:enumeration value="Small + mech. clutch + AMS"/>
 			<xs:enumeration value="Medium Supply 1-stage"/>
 			<xs:enumeration value="Medium Supply 1-stage + ESS"/>
-			<xs:enumeration value="Medium Supply 1-stage + visco clutch "/>
+			<xs:enumeration value="Medium Supply 1-stage + visco clutch"/>
 			<xs:enumeration value="Medium Supply 1-stage + mech. clutch"/>
 			<xs:enumeration value="Medium Supply 1-stage + ESS + AMS"/>
 			<xs:enumeration value="Medium Supply 1-stage + visco clutch + AMS"/>
 			<xs:enumeration value="Medium Supply 1-stage + mech. clutch + AMS"/>
 			<xs:enumeration value="Medium Supply 2-stage"/>
 			<xs:enumeration value="Medium Supply 2-stage + ESS"/>
-			<xs:enumeration value="Medium Supply 2-stage + visco clutch "/>
+			<xs:enumeration value="Medium Supply 2-stage + visco clutch"/>
 			<xs:enumeration value="Medium Supply 2-stage + mech. clutch"/>
 			<xs:enumeration value="Medium Supply 2-stage + ESS + AMS"/>
 			<xs:enumeration value="Medium Supply 2-stage + visco clutch + AMS"/>
 			<xs:enumeration value="Medium Supply 2-stage + mech. clutch + AMS"/>
 			<xs:enumeration value="Large Supply"/>
 			<xs:enumeration value="Large Supply + ESS"/>
-			<xs:enumeration value="Large Supply + visco clutch "/>
+			<xs:enumeration value="Large Supply + visco clutch"/>
 			<xs:enumeration value="Large Supply + mech. clutch"/>
 			<xs:enumeration value="Large Supply + ESS + AMS"/>
 			<xs:enumeration value="Large Supply + visco clutch + AMS"/>
 			<xs:enumeration value="Large Supply + mech. clutch + AMS"/>
 			<xs:enumeration value="Vacuum pump"/>
+			<!--fully electric-->
 			<xs:enumeration value="Small + elec. driven"/>
-			<xs:enumeration value="Small + ESS + elec. driven "/>
+			<xs:enumeration value="Small + AMS + elec. driven"/>
 			<xs:enumeration value="Medium Supply 1-stage + elec. driven"/>
-			<xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven "/>
+			<xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven"/>
 			<xs:enumeration value="Medium Supply 2-stage + elec. driven"/>
 			<xs:enumeration value="Medium Supply 2-stage + AMS + elec. driven"/>
 			<xs:enumeration value="Large Supply + elec. driven"/>