diff --git a/Build/Packaging.targets b/Build/Packaging.targets
new file mode 100644
index 0000000000000000000000000000000000000000..93a91f4250565b6b5edbf987781e5e2797b3a57c
--- /dev/null
+++ b/Build/Packaging.targets
@@ -0,0 +1,124 @@
+<Project DefaultTargets = "Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
+  <PropertyGroup>
+	<CleanDependsOn>
+		$(CleanDependsOn)
+		CleanVectoDeploy
+	</CleanDependsOn>
+  </PropertyGroup>
+  
+    <UsingTask TaskName="Zip" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+  <ParameterGroup>
+    <OutputFilename ParameterType="System.String" Required="true" />
+    <Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+	<SourcePath ParameterType="System.String" Required="true"/>
+	<DestinationPath ParameterType="System.String" Required="true"/>
+  </ParameterGroup>
+  <Task>
+    <Reference Include="System.IO.Compression" />
+    <Using Namespace="System.IO.Compression" />
+    <Code Type="Fragment" Language="cs">
+    <![CDATA[
+      try
+      {
+        using (Stream zipStream = new FileStream(Path.GetFullPath(OutputFilename), FileMode.Create, FileAccess.Write))
+        using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create))
+        {
+            foreach (ITaskItem fileItem in Files)
+            {
+                string filename = fileItem.ItemSpec;
+                using (Stream fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read))
+				using (Stream fileStreamInZip = archive.CreateEntry(fileItem.ItemSpec.Replace(SourcePath, DestinationPath)).Open())
+                    fileStream.CopyTo(fileStreamInZip);
+            }
+        }
+        return true;
+      }
+      catch (Exception ex)
+      {
+        Log.LogErrorFromException(ex);
+        return false;
+      }
+    ]]>
+    </Code>
+  </Task>
+</UsingTask>
+
+<Target Name="GenerateReleasenotesPDF" BeforeTargets="AfterBuild">  
+	<Exec Command="cscript &quot;$(solutiondir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>  
+</Target>  
+<Target Name="GenerateHelpHTML" BeforeTargets="AfterBuild">  
+	<Exec Command="&quot;$(solutiondir)documentation\user manual\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\user manual"/>  
+</Target>  
+
+<Target Name="BeforeBuild" Condition="$(Configuration) == 'Deploy' OR $(Configuration) == 'Release'">
+	<ItemGroup>
+		<VersionTemplates Include="$(SolutionDir)**\Version.tt"/>
+	</ItemGroup>
+	<Exec Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; &quot;%(VersionTemplates.Identity)&quot;"/>
+</Target>
+
+<Target Name="AfterBuild" Condition="$(Configuration) == 'Deploy'">
+	<ItemGroup>  
+		<VectoCoreAssembly Include="$(OutputPath)VectoCore.dll" />  
+		<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Deploy\vectocmd.exe*"/>
+		
+		<GenericVehicles Include="$(SolutionDir)Generic Vehicles\**\*.*" Exclude="$(SolutionDir)**\*.vmod;$(SolutionDir)**\*.vsum;$(SolutionDir)**\*RSLT_*.xml;$(SolutionDir)**\*.pdf"/>
+		<MissionProfiles Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\MissionCycles\**\*.*"/>
+		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.csv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.vacc" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+		<VectoXSD Include="$(SolutionDir)VectoCore\VectoCore\Resources\XSD\**\*.*" Exclude="$(SolutionDir)**\*Engineering*"/>
+		<VectoXMLExamples Include="$(SolutionDir)VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\*-sample.xml"/>
+		<UserManual Include="$(SolutionDir)Documentation\User Manual\help.html"/>
+		<UserManual Include="$(SolutionDir)Documentation\XML\*.pdf"/>
+		<UserManual Include="$(SolutionDir)Documentation\XML\VectoParameters.html"/>
+		<UserManual Include="$(SolutionDir)Documentation\User Manual Source\JIRA Quick Start Guide.pdf"/>
+		<UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/>
+		<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
+	</ItemGroup>
+	
+	<Message Text="@(VectoCommandLine)"/>
+	<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(OutputPath)"/>
+	<Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(OutputPath)\Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(OutputPath)\Declaration" />
+	<Copy SourceFiles="@(MissionProfiles)" DestinationFolder="$(OutputPath)\Mission Profiles" />
+	<Copy SourceFiles="@(VectoXMLExamples)" DestinationFolder="$(OutputPath)\XML\Examples" />
+	<Copy SourceFiles="@(VectoXSD)" DestinationFolder="$(OutputPath)\XML\XSD" />
+	<Copy SourceFiles="@(UserManual)" DestinationFolder="$(OutputPath)\User Manual" />
+	<Copy SourceFiles="@(ReleaseNotes)" DestinationFiles="$(OutputPath)\User Manual\Release Notes.pdf" />
+	<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Mission Profiles Directory.txt" DestinationFiles="$(OutputPath)\Mission Profiles\!! README !!.TXT"/>
+	<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Declaration Directory.txt" DestinationFiles="$(OutputPath)\Declaration\!! README !!.TXT"/>
+	<ItemGroup>
+		<ZipFiles Include="$(OutputPath)Declaration\**\*.*" />
+		<ZipFiles Include="$(OutputPath)Generic Vehicles\**\*.*" />
+		<ZipFiles Include="$(OutputPath)Mission Profiles\**\*.*" />
+		<ZipFiles Include="$(OutputPath)User Manual\**\*.*" />
+		<ZipFiles Include="$(OutputPath)XML\**\*.*" />
+	</ItemGroup>
+
+	<GetAssemblyIdentity  AssemblyFiles="@(VectoCoreAssembly)">
+		<Output  TaskParameter="Assemblies"  ItemName="VectoAssemblyIdentities"  />
+	</GetAssemblyIdentity>
+	<ItemGroup>
+		<ZipFiles Include="$(OutputPath)*.dll" />
+		<ZipFiles Include="$(OutputPath)VECTO.exe*" />
+		<ZipFiles Include="$(OutputPath)vectocmd.exe*"/>
+	</ItemGroup>
+	<Zip OutputFilename="$(OutputPath)Vecto_%(VectoAssemblyIdentities.Version).zip" Files="@(ZipFiles)" SourcePath="$(OutputPath)" DestinationPath="VECTO_%(VectoAssemblyIdentities.Version)\"/>
+</Target>
+
+<Target Name="CleanVectoDeploy" Condition="$(Configuration) == 'Deploy'">
+	<ItemGroup>
+		<CustomFilesToClean Include="$(OutputPath)Declaration\**\*.*" />
+		<CustomFilesToClean Include="$(OutputPath)Generic Vehicles\**\*.*" />
+		<CustomFilesToClean Include="$(OutputPath)Mission Profiles\**\*.*" />
+		<CustomFilesToClean Include="$(OutputPath)User Manual\**\*.*" />
+		<CustomFilesToClean Include="$(OutputPath)XML\**\*.*" />
+		<CustomFoldersToClean Include="%(CustomFilesToClean.RootDir)%(CustomFilesToClean.Directory)"/>
+	</ItemGroup>
+	<!-- <Message Text="@(CustomFilesToClean)" Importance="normal"/> -->
+	<!-- <Message Text="@(CustomFoldersToClean)" Importance="normal"/> -->
+	<Delete Files="@CustomFilesToClean"/>
+	<RemoveDir Directories="@(CustomFoldersToClean)"/>
+</Target>
+
+</Project>
\ No newline at end of file
diff --git a/Documentation/User Manual/convert.bat b/Documentation/User Manual/convert.bat
index c80082457f447f716e8e79be5b840c515a9ea6ae..20a74b750cc7803a44bed9b89f2e7ec3900cb22c 100644
--- a/Documentation/User Manual/convert.bat	
+++ b/Documentation/User Manual/convert.bat	
@@ -9,7 +9,7 @@ for /f %%f in (files.txt) do set LIST=!LIST! "%%f"
 
 
 REM pandoc --verbose  -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --mathjax=includes/mathjax.js -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
-pandoc --verbose  -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
+%LOCALAPPDATA%\Pandoc\pandoc --verbose  -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
 
 REM pandoc %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex  -c includes/style.css -B includes/header.html -A includes/footer.html -o help.html  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
 REM pandoc %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex="https://latex.codecogs.com/svg.latex?\large "  -c includes/style.css -B includes/header.html -A includes/footer.html -o help.html  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
diff --git a/HashingCmd/HashingCmd.csproj b/HashingCmd/HashingCmd.csproj
index 7ee07480a160366124db4c0ab30057e323729952..948021e5dab8e943592c321df4a8d5112cb16270 100644
--- a/HashingCmd/HashingCmd.csproj
+++ b/HashingCmd/HashingCmd.csproj
@@ -31,6 +31,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/HashingCmd/Properties/Version.tt b/HashingCmd/Properties/Version.tt
index ce60176128751b903ebfe4cab78a59db0ace3308..a1d6b02cff4884e378c4067d1c7b0e93ce5e07a2 100644
--- a/HashingCmd/Properties/Version.tt
+++ b/HashingCmd/Properties/Version.tt
@@ -1,7 +1,7 @@
 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2016 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
diff --git a/HashingTool/HashingTool.csproj b/HashingTool/HashingTool.csproj
index 7fd102e465c75cba559d046dce36637f2425dd54..903b0ee04fd3128a0d94ac6cb03149fc621b2692 100644
--- a/HashingTool/HashingTool.csproj
+++ b/HashingTool/HashingTool.csproj
@@ -33,6 +33,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/HashingTool/Properties/Version.tt b/HashingTool/Properties/Version.tt
index ce60176128751b903ebfe4cab78a59db0ace3308..a1d6b02cff4884e378c4067d1c7b0e93ce5e07a2 100644
--- a/HashingTool/Properties/Version.tt
+++ b/HashingTool/Properties/Version.tt
@@ -1,7 +1,7 @@
 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2016 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
index 4df223386ea4d6b30234ab6d13f1dc63b5ded5f4..5fda6467dc0eb6cc5ac76f8e911992d9787174cc 100644
--- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
+++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
@@ -31,6 +31,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index 40d271830ed483c7dff3935413aa202809c97cbe..f073af8706d2f77c027169bfe9bfb94c8c67787a 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -31,6 +31,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Tools/LicenceHeader/LicenceHeader.csproj b/Tools/LicenceHeader/LicenceHeader.csproj
index 40898d4d3593ab6e4a84bcc1084d79b813bfaed0..86642c0757bc2c30538f6ec2e16bf6d473187596 100644
--- a/Tools/LicenceHeader/LicenceHeader.csproj
+++ b/Tools/LicenceHeader/LicenceHeader.csproj
@@ -31,6 +31,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Tools/VectoLegacyTests/VectoLegacyTests.csproj b/Tools/VectoLegacyTests/VectoLegacyTests.csproj
index 219ddd1c5c7df02b3adc21848f601989db5879f8..29c9305744edb3c7e5e49bf814df4ac4fbcf17a3 100644
--- a/Tools/VectoLegacyTests/VectoLegacyTests.csproj
+++ b/Tools/VectoLegacyTests/VectoLegacyTests.csproj
@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/VECTO.sln b/VECTO.sln
index f30c2893267063f9b98fb47c75a6305dbf38bf53..60bf8d51b1dc24adade1eb03c1310ada42203bb8 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
+	ProjectSection(ProjectDependencies) = postProject
+		{60AD4DF0-6648-4374-83CB-C7A162EFB391} = {60AD4DF0-6648-4374-83CB-C7A162EFB391}
+	EndProjectSection
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliaries", "VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj", "{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}"
 EndProject
@@ -75,6 +78,9 @@ Global
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Deploy|Any CPU = Deploy|Any CPU
+		Deploy|x64 = Deploy|x64
+		Deploy|x86 = Deploy|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
@@ -95,6 +101,11 @@ Global
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Debug|x86.ActiveCfg = Debug|x86
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Debug|x86.Build.0 = Debug|x86
+		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|x86.ActiveCfg = Deploy|x86
+		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|x86.Build.0 = Deploy|x86
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|x64.ActiveCfg = Release|Any CPU
@@ -110,6 +121,10 @@ Global
 		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Release|x64.ActiveCfg = Release|Any CPU
@@ -126,6 +141,10 @@ Global
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|x64.ActiveCfg = Release|Any CPU
@@ -140,6 +159,9 @@ Global
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|x64.ActiveCfg = Release|Any CPU
@@ -156,6 +178,9 @@ Global
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|x64.ActiveCfg = Release|Any CPU
@@ -169,6 +194,9 @@ Global
 		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Deploy|x64.ActiveCfg = Debug|Any CPU
+		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Deploy|x86.ActiveCfg = Debug|Any CPU
 		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}.Release|x86.ActiveCfg = Release|Any CPU
@@ -182,6 +210,10 @@ Global
 		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|x64.ActiveCfg = Release|Any CPU
@@ -198,6 +230,10 @@ Global
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|x64.ActiveCfg = Release|Any CPU
@@ -214,6 +250,9 @@ Global
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|x64.ActiveCfg = Release|Any CPU
@@ -230,6 +269,9 @@ Global
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|x64.ActiveCfg = Release|Any CPU
@@ -246,6 +288,9 @@ Global
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|x64.ActiveCfg = Release|Any CPU
@@ -260,6 +305,10 @@ Global
 		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|x64.ActiveCfg = Release|Any CPU
@@ -274,6 +323,9 @@ Global
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|x64.ActiveCfg = Release|Any CPU
@@ -288,6 +340,9 @@ Global
 		{49F0275A-4517-49FA-859E-77279B9C8B18}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49F0275A-4517-49FA-859E-77279B9C8B18}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{49F0275A-4517-49FA-859E-77279B9C8B18}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49F0275A-4517-49FA-859E-77279B9C8B18}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{49F0275A-4517-49FA-859E-77279B9C8B18}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{49F0275A-4517-49FA-859E-77279B9C8B18}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{49F0275A-4517-49FA-859E-77279B9C8B18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49F0275A-4517-49FA-859E-77279B9C8B18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{49F0275A-4517-49FA-859E-77279B9C8B18}.Release|x64.ActiveCfg = Release|Any CPU
@@ -302,6 +357,10 @@ Global
 		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Release|x64.ActiveCfg = Release|Any CPU
@@ -316,6 +375,9 @@ Global
 		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D959CB7C-F514-4F5E-9C33-684D0012474B}.Release|x64.ActiveCfg = Release|Any CPU
@@ -330,6 +392,9 @@ Global
 		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Release|x64.ActiveCfg = Release|Any CPU
@@ -344,6 +409,9 @@ Global
 		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{749F150A-F974-46DC-A1E2-F4153C54FC0D}.Release|x64.ActiveCfg = Release|Any CPU
@@ -358,6 +426,9 @@ Global
 		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Release|x64.ActiveCfg = Release|Any CPU
@@ -372,6 +443,9 @@ Global
 		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|x64.ActiveCfg = Release|Any CPU
@@ -386,6 +460,10 @@ Global
 		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|x64.ActiveCfg = Release|Any CPU
@@ -400,6 +478,9 @@ Global
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.Build.0 = Release|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|x64.ActiveCfg = Release|Any CPU
@@ -414,6 +495,9 @@ Global
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|x64.ActiveCfg = Release|Any CPU
@@ -428,6 +512,9 @@ Global
 		{33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|x64.ActiveCfg = Deploy|Any CPU
+		{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|x86.ActiveCfg = Deploy|Any CPU
 		{33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33F9848E-9257-4BE2-915F-68E748AEB204}.Release|x64.ActiveCfg = Release|Any CPU
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 3f965fcd2db740151a699b4e80e0e52dc769bfad..4db0186bc0e244964cb21e5d2c41685eff3ccdeb 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -130,6 +130,28 @@
   <PropertyGroup>
     <OptionStrict>On</OptionStrict>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DocumentationFile>VECTO.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <WarningLevel>1</WarningLevel>
+    <DebugType>None</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|x86'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x86\Deploy\</OutputPath>
+    <DocumentationFile>VECTO.xml</DocumentationFile>
+    <WarningLevel>1</WarningLevel>
+    <DebugType>None</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -525,4 +547,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  
+	<Import Project="$(SolutionDir)Build\Packaging.targets"/>
+  
 </Project>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 5cefae0c9615ebc81c3c485d7b8c65862f626cc0..1b0669f034490009638dc8ab89441f11b3df947c 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -57,6 +57,16 @@
   <PropertyGroup>
     <OptionInfer>Off</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DocumentationFile>BusAuxiliaries.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DocumentFormat.OpenXml, Version=2.0.5022.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -300,7 +310,7 @@
       <Name>AdvancedAuxiliaryInterfaces</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
-      <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+      <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
       <Name>VectoCommon</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 2d4069494e90e83f5fd60f4268f46365c07554f3..c9273bbf4349a229fddf61cfa40b9d84b9c5d5e9 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -58,6 +58,15 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DocumentationFile>VectoAuxiliariesTests.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
index 4195ff47a5af2870a700ba6daf798781c707e7e2..a6eb9991a4f39a7df80cb54097baa33eb28068fd 100644
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
+++ b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
@@ -53,6 +53,16 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DocumentationFile>AdvancedAuxiliaryInterfaces.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -123,7 +133,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VectoCommon\VectoCommon.csproj">
-      <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+      <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
       <Name>VectoCommon</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/VectoCommon/VectoCommon/Properties/Version.tt b/VectoCommon/VectoCommon/Properties/Version.tt
index 8ba3fd28c6503d839db56a147494e1473101787e..2e262103697d1c6280bf1d5fbfd272b2464c2e9b 100644
--- a/VectoCommon/VectoCommon/Properties/Version.tt
+++ b/VectoCommon/VectoCommon/Properties/Version.tt
@@ -1,7 +1,7 @@
 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2016 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 32996b2b506cddb0bdcb3a7dea7034fd77b1ea15..54c52e051ba4df56cdc41aac2c099c001b61cc1d 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -30,6 +30,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog">
       <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj
index 965dbb5057d31bb88ee378deb2fba54c0cc58698..8ac7aaffade25abb8d29d40af973f28ce5ff43a1 100644
--- a/VectoCommon/VectoHashing/VectoHashing.csproj
+++ b/VectoCommon/VectoHashing/VectoHashing.csproj
@@ -29,6 +29,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index b6a36b9a249c06ba2ff31a73aef4e734321566c5..543f5b7befbb3da42da6c996497b963eec8b9d42 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
diff --git a/VectoConsole/Properties/Version.tt b/VectoConsole/Properties/Version.tt
index cecce4473bf5eaba5b761f02e0c5b1c3218fb9be..8401823d7f18676afbd59d04c5f6409fd78d60f1 100644
--- a/VectoConsole/Properties/Version.tt
+++ b/VectoConsole/Properties/Version.tt
@@ -1,7 +1,7 @@
 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2016 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index 082fd87fc7f39ef2e6db3be3d12dbddad481808f..1edccea649ae9ffe484e424b678e797920699fcc 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -52,6 +52,16 @@
   <PropertyGroup>
     <ApplicationIcon>VECTO.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index 15a2dce46e01ee20f53e99b305ac2aac629c006d..553e3b89bd4b7b87f504cc30feb72e571732be19 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -35,6 +35,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
diff --git a/VectoCore/VectoCore/Models/Declaration/AirDrag.cs b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
index 7906969d149da9931cd4a3cb3c4fcfaa8a8c987f..9e260a93daf63bfb929f3fe347667bc6ffe9a3d7 100644
--- a/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
+++ b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 	{
 		protected override string ResourceId
 		{
-			get { return DeclarationData.DeclarationDataResourcePrefix + ".VCDV.parameters.csv"; }
+			get { return DeclarationData.DeclarationDataResourcePrefix + ".VCDV.VCDV_parameters.csv"; }
 		}
 
 		protected override string ErrorMessage
@@ -73,4 +73,4 @@ namespace TUGraz.VectoCore.Models.Declaration
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/VectoCore/VectoCore/Properties/Version.tt b/VectoCore/VectoCore/Properties/Version.tt
index 8ba3fd28c6503d839db56a147494e1473101787e..2e262103697d1c6280bf1d5fbfd272b2464c2e9b 100644
--- a/VectoCore/VectoCore/Properties/Version.tt
+++ b/VectoCore/VectoCore/Properties/Version.tt
@@ -1,7 +1,7 @@
 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2016 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
diff --git a/VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv b/VectoCore/VectoCore/Resources/Declaration/VCDV/VCDV_parameters.csv
similarity index 100%
rename from VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv
rename to VectoCore/VectoCore/Resources/Declaration/VCDV/VCDV_parameters.csv
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.6.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.6.xsd
deleted file mode 100644
index 96ac2104dfcb15ec8f31da40405a426e2042a365..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.6.xsd
+++ /dev/null
@@ -1,1730 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<?xml-stylesheet type="text/xsl" href="RenderTable.xslt"?>
-<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.6" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
-	<xs:complexType name="ADASOverspeedDeclarationType">
-		<xs:sequence>
-			<xs:element name="Mode" type="tns:ADASOverspeedModeDeclarationType">
-				<xs:annotation>
-					<xs:documentation>P015</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AngledriveComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AngledriveDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AngledriveDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Ratio" type="tns:AngledriveRatioType">
-						<xs:annotation>
-							<xs:documentation>P176 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TorqueLossMap">
-						<xs:complexType>
-							<xs:sequence minOccurs="4" maxOccurs="unbounded">
-								<xs:element name="Entry" type="tns:AngledriveLossMapEntryType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AngledriveLossMapEntryType">
-		<xs:attribute name="inputSpeed" type="tns:AngledriveInputSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P173 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorque" type="tns:AngledriveInputTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P174 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:AngledriveTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P175 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesBaseType">
-		<xs:annotation>
-			<xs:documentation>Auxiliaries</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:VectoSimulationComponent"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AuxiliariesDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:AuxiliariesBaseType">
-				<xs:sequence>
-					<xs:element name="Fan">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxFanTechnologyType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="SteeringPump">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxSPTechnologyType" maxOccurs="4"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="ElectricSystem">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxESTechnologyType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="PneumaticSystem">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxPSTechnologyType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="HVAC">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxHVACTechnologyType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AxleDeclarationType">
-		<xs:sequence>
-			<xs:group ref="tns:GeneralComponentDataElements"/>
-			<xs:element name="Dimension" type="tns:WheelsDimensionType">
-				<xs:annotation>
-					<xs:documentation>P108 - enum</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RRCISO" type="tns:WheelsRRCISOType">
-				<xs:annotation>
-					<xs:documentation>P046 - [-]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FzISO" type="tns:WheelsFzISOType">
-				<xs:annotation>
-					<xs:documentation>P047 - [N]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="axleNumber" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:int">
-					<xs:minInclusive value="1"/>
-					<xs:maxInclusive value="4"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="twinTyres" type="tns:AxleTwinTyresType" use="required">
-			<xs:annotation>
-				<xs:documentation>P045 - bool</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="axleType" type="tns:AxleTypeType" use="required">
-			<xs:annotation>
-				<xs:documentation>P154 - enum</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AxlegearComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AxlegearDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AxlegearDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Axlegear Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Ratio" type="tns:AxlegearRatioType">
-						<xs:annotation>
-							<xs:documentation>P150 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TorqueLossMap">
-						<xs:complexType>
-							<xs:sequence minOccurs="4" maxOccurs="unbounded">
-								<xs:element name="Entry" type="tns:AxlegearTorqueLossMapEntryType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AxlegearTorqueLossMapEntryType">
-		<xs:attribute name="inputSpeed" type="tns:AxlegearInputSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P151 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorque" type="tns:AxlegearInputTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P152 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:AxlegearTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P153 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AxlegearTorqueLossMapType"/>
-	<xs:complexType name="AxleWheelsComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AxleWheelsDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AxleWheelsDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Axles &amp; Wheels Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:VectoSimulationComponent">
-				<xs:sequence>
-					<xs:element name="Axles">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Axle" type="tns:AxleDeclarationType" minOccurs="2" maxOccurs="4"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="EngineComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:EngineDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="EngineDataBaseType">
-		<xs:annotation>
-			<xs:documentation>Engine Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Displacement" type="tns:EngineDisplacementType" nillable="false">
-						<xs:annotation>
-							<xs:documentation>P061 - [cm³]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IdlingSpeed" type="tns:EngineIdlingSpeedType">
-						<xs:annotation>
-							<xs:documentation>P063 - [1/min]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="EngineDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:EngineDataBaseType">
-				<xs:sequence>
-					<xs:element name="WHTCUrban" type="tns:EngineWHTCType">
-						<xs:annotation>
-							<xs:documentation>P109 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="WHTCRural" type="tns:EngineWHTCType">
-						<xs:annotation>
-							<xs:documentation>P110 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="WHTCMotorway" type="tns:EngineWHTCType">
-						<xs:annotation>
-							<xs:documentation>P111 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ColdHotBalancingFactor" type="tns:EngineColdHotBalancingFactorType">
-						<xs:annotation>
-							<xs:documentation>P159 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="FuelConsumptionMap">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="FullLoadAndDragCurve">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="EngineStartStopDeclarationType">
-		<xs:sequence>
-			<xs:element name="Enabled" type="tns:ADASEngineStartStopEnabled">
-				<xs:annotation>
-					<xs:documentation>P010 </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="FuelConsumptionEntryType">
-		<xs:attribute name="engineSpeed" type="tns:EngineSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P072 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torque" type="tns:EngineFuelConsumptionMapTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P073 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="fuelConsumption" type="tns:EngineFuelConsumptionMapFuelConsumptionType" use="required">
-			<xs:annotation>
-				<xs:documentation>P074 - [g/h]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="FullLoadAndDragCurveEntryType">
-		<xs:attribute name="engineSpeed" type="tns:EngineSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P068 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="maxTorque" type="tns:EngineFLDMaxTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P069 - [N]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="dragTorque" type="tns:EngineFLDDragTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P070 - [N]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="FullLoadCurveType"/>
-	<xs:complexType name="GearBaseType">
-		<xs:sequence>
-			<xs:element name="Ratio" type="tns:GearboxGearRatioType">
-				<xs:annotation>
-					<xs:documentation>P078 - [-]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="number" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:int">
-					<xs:minInclusive value="1"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="GearboxComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:GearboxDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-			<xs:element name="TorqueConverter" type="tns:TorqueConverterComponentDeclarationType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GearboxDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Gearbox Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="TransmissionType" type="tns:GearboxTransmissionTypeType">
-						<xs:annotation>
-							<xs:documentation>P076 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Gears">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Gear" type="tns:GearDeclarationType" maxOccurs="99"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="GearDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:GearBaseType">
-				<xs:sequence>
-					<xs:element name="MaxTorque" type="tns:GearboxGearMaxTorqueType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P157 - [Nm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TorqueLossMap">
-						<xs:complexType>
-							<xs:complexContent>
-								<xs:extension base="tns:TorqueLossMapType">
-									<xs:sequence>
-										<xs:element name="Entry" type="tns:TorqueLossMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
-									</xs:sequence>
-								</xs:extension>
-							</xs:complexContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="DeclarationPowertrainComponentType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="tns:VectoSimulationComponent">
-				<xs:sequence>
-					<xs:group ref="tns:GeneralComponentDataElements"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="RetarderComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:RetarderDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="RetarderDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Retarder Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="RetarderLossMap">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:RetarderLossmapEntryType" minOccurs="2" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="RetarderLossmapEntryType">
-		<xs:attribute name="retarderSpeed" type="tns:RetarderSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P057 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:RetarderTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P058 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="SignatureType">
-		<xs:annotation>
-			<xs:documentation>Placeholder (so far)</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:sequence>
-				<xs:element name="ComponentDataHash">
-					<xs:annotation>
-						<xs:documentation>base64 encoded hash of component data</xs:documentation>
-					</xs:annotation>
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="10"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-			</xs:sequence>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="TorqueConverterCharacteristicsEntryType">
-		<xs:attribute name="speedRatio" type="tns:TorqueConverterSpeedRatioType">
-			<xs:annotation>
-				<xs:documentation>P099 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueRatio" type="tns:TorqueConverterTorqueRatioType">
-			<xs:annotation>
-				<xs:documentation>P100 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorqueRef" type="tns:TorqueConverterInputTorqueRefType">
-			<xs:annotation>
-				<xs:documentation>P101 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="TorqueConverterComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:TorqueConverterDeclarationDataType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TorqueConverterDeclarationDataType">
-		<xs:sequence>
-			<xs:element name="Characteristics">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Entry" type="tns:TorqueConverterCharacteristicsEntryType" minOccurs="2" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TorqueLossMapEntryType">
-		<xs:attribute name="inputSpeed" type="tns:GearboxGearInputSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P096 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorque" type="tns:GearboxGearInputTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P097 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:GearboxGearTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P098 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="TorqueLossMapType"/>
-	<xs:complexType name="VectoDeclarationJobType">
-		<xs:sequence>
-			<xs:element name="Vehicle">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tns:VehicleDeclarationType"/>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="schemaVersion" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:decimal">
-					<xs:minExclusive value="0"/>
-					<xs:fractionDigits value="1"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="VectoSimulationComponent" abstract="true">
-		<xs:attribute name="id">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:minLength value="5"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="VehicleBaseType">
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="VehicleCategory" type="tns:VehicleCategoryType">
-						<xs:annotation>
-							<xs:documentation>P036 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AxleConfiguration" type="tns:VehicleAxleConfigurationType">
-						<xs:annotation>
-							<xs:documentation>P037 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CurbWeightChassis" type="tns:VehicleCurbWeightChassisType">
-						<xs:annotation>
-							<xs:documentation>P038 - [kg]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="GrossVehicleMass" type="tns:VehicleGrossVehicleMassType">
-						<xs:annotation>
-							<xs:documentation>P041 - [kg]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CdxA" type="tns:VehicleCdxAType">
-						<xs:annotation>
-							<xs:documentation>P146 - [m²]  Drag coefficient * Cross Sectional Area (Truck &amp; Trailer)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SteeredAxles" type="tns:SteeredAxlesType">
-						<xs:annotation>
-							<xs:documentation>P179 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RetarderType" type="tns:RetarderTypeType">
-						<xs:annotation>
-							<xs:documentation>P052 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RetarderRatio" type="tns:RetarderRatioType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P053 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AngledriveType" type="tns:AngledriveTypeType">
-						<xs:annotation>
-							<xs:documentation>P180 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PTOType" type="tns:PTOTypeType">
-						<xs:annotation>
-							<xs:documentation>P186 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="VehicleDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:VehicleBaseType">
-				<xs:sequence>
-					<xs:element name="Components">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Engine" type="tns:EngineComponentDeclarationType"/>
-								<xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/>
-								<xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/>
-								<xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/>
-								<xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/>
-								<xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
-								<xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="AdvancedDriverAssist">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="EngineStartStop" type="tns:EngineStartStopDeclarationType"/>
-								<xs:element name="Overspeed" type="tns:ADASOverspeedDeclarationType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:simpleType name="ADASEngineStartStopEnabled">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Enabled">010</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>ADAS</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P010 - bool</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="ADASOverspeedModeDeclarationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Mode">015</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>ADAS</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P015 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Overspeed"/>
-			<xs:enumeration value="EcoRoll"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>173</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Angledrive</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P173</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="5000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveInputTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>174</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Angledrive</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P174</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="-500000"/>
-			<xs:maxInclusive value="500000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>176</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Angledrive</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P176</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>175</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Angledrive</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P175</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveTypeType">
-		<xs:annotation>
-			<xs:documentation>P180</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>180</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="LossesIncludedInGearbox"/>
-			<xs:enumeration value="SeparateAngledrive"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxESTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P183</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>183</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Standard technology"/>
-			<xs:enumeration value="Standard technology - LED headlights, all"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxFanTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P181</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>181</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
-			<xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Crankshaft mounted - Discrete step clutch"/>
-			<xs:enumeration value="Crankshaft mounted - On/off clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/>
-			<xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
-			<xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
-			<xs:enumeration value="Electrically driven - Electronically controlled"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxHVACTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P185</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>185</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Default"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxiliaryTechlistEntryType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description status="deprecated">
-					<vectoParam:parameterId name="Entry">143</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>DEPRECATED  - P143 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="LED lights"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxiliaryTechnologyType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description status="deprecated">
-					<vectoParam:parameterId name="Technology">118</vectoParam:parameterId>
-					<vectoParam:comment>Valid technology selection depends on the Auxiliary Type (P005)</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>DEPRECATED  - P118 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Default"/>
-			<xs:enumeration value="Fixed displacement"/>
-			<xs:enumeration value="Variable displacement"/>
-			<xs:enumeration value="Hydraulic supported by electric"/>
-			<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch (Default)"/>
-			<xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Crankshaft mounted - Discrete step clutch"/>
-			<xs:enumeration value="Crankshaft mounted - On/Off clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - On/Off clutch"/>
-			<xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
-			<xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
-			<xs:enumeration value="Hydraulic driven - Electronically controlled"/>
-			<xs:enumeration value="Custom Technology List"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxiliaryTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description status="deprecated">
-					<vectoParam:parameterId name="Type">005</vectoParam:parameterId>
-					<vectoParam:comment>List of auxiliary types predefined in delcaration mode, Technology (P118) and TechList (P143) must be specified</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>DEPRECATED  - P005 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fan"/>
-			<xs:enumeration value="Steering pump"/>
-			<xs:enumeration value="HVAC"/>
-			<xs:enumeration value="Pneumatic System"/>
-			<xs:enumeration value="Electric System"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxPSTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P184</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>184</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Small"/>
-			<xs:enumeration value="Small + ESS"/>
-			<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 + 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 + 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 + 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:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxSPTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P182</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>182</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Auxiliaries</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fixed displacement"/>
-			<xs:enumeration value="Fixed displacement with elec. control"/>
-			<xs:enumeration value="Dual displacement"/>
-			<xs:enumeration value="Variable displacement mech. controlled"/>
-			<xs:enumeration value="Variable displacement elec. controlled"/>
-			<xs:enumeration value="Electric"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="inputSpeed">151</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Axlegear</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P151 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="5000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearInputTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="inputTorque">152</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Axlegear</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P152 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="-500000"/>
-			<xs:maxInclusive value="500000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Ratio">150</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Axlegear</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P150 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="torqueLoss">153</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Axlegear</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P153 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxleTwinTyresType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="twinTyres">045</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Axle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P045 - bool</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="AxleTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="axleType">154</vectoParam:parameterId>
-					<vectoParam:comment>Trailer axles must not be specified in declaration mode!</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Axle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P147 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="VehicleNonDriven"/>
-			<xs:enumeration value="VehicleDriven"/>
-			<xs:enumeration value="Trailer"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="DateTimeWithTimezone">
-		<xs:restriction base="xs:dateTime">
-			<xs:pattern value=".+T.+(Z|[+-].+)"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineColdHotBalancingFactorType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="ColdHotBalancingFactor">159</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P159 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineDisplacementType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Displacement">061</vectoParam:parameterId>
-					<vectoParam:unit>cm³</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P061 - [cm³]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="1000"/>
-			<xs:maxInclusive value="20000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFLDDragTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="dragTorque">070</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P070 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="-10000"/>
-			<xs:maxInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFLDMaxTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="maxTorque" usage="Engie FLD maxTorque">069</vectoParam:parameterId>
-					<vectoParam:parameterId name="reducedMaxTorque" usage="EngineFLD reducedMaxTorque">158</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P069 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="10000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFuelConsumptionMapFuelConsumptionType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="fuelConsumption">074</vectoParam:parameterId>
-					<vectoParam:unit>g/h</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P074 - [g/h]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFuelConsumptionMapTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="torque">073</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P073 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="-1000"/>
-			<xs:maxInclusive value="10000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineIdlingSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="IdlingSpeed">063</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P063 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="400"/>
-			<xs:maxInclusive value="1000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="engineSpeed" usage="Full load curve">068</vectoParam:parameterId>
-					<vectoParam:parameterId name="engineSpeed" usage="FC map">072</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P068, P072 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="400"/>
-			<xs:maxInclusive value="5000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineWHTCType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="WHTCUrban" usage="Urban">109</vectoParam:parameterId>
-					<vectoParam:parameterId name="WHTCRural" usage="Rural">110</vectoParam:parameterId>
-					<vectoParam:parameterId name="WHTCMotorway" usage="Motorway">111</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Engine</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P109 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearFLDInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description status="deprecated">
-					<vectoParam:parameterId name="inputSpeed">148</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P148 - [1/min] - DEPRECATED</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="400"/>
-			<xs:maxInclusive value="5000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearFLDMaxTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description status="deprecated">
-					<vectoParam:parameterId name="maxTorque">149</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P149 - [Nm] - DEPRECATED</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:maxInclusive value="10000"/>
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="inputSpeed">096</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P096 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearInputTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="inputTorque">097</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P097 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="-10000"/>
-			<xs:maxInclusive value="10000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearMaxTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="maxTorque">157</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P157 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-			<xs:maxInclusive value="10000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Ratio">078</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P078 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-			<xs:maxInclusive value="25"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="torqueLoss">098</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P098 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxTransmissionTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="TransmissionType">076</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Gearbox</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P076 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="MT"/>
-			<xs:enumeration value="AMT"/>
-			<xs:enumeration value="AT - Serial"/>
-			<xs:enumeration value="AT - PowerSplit"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="RetarderRatio">053</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P053 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="retarderSpeed">057</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-					<vectoParam:component>Retarder</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P057 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="torqueLoss">058</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Retarder</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P058 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="500"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PTOTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="torqueLoss">058</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>Retarder</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P058 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="500"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Type">052</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P052 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Losses included in Gearbox"/>
-			<xs:enumeration value="Engine Retarder"/>
-			<xs:enumeration value="Transmission Input Retarder"/>
-			<xs:enumeration value="Transmission Output Retarder"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="SteeredAxlesType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>179</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="4"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterInputTorqueRefType">
-		<xs:annotation>
-			<xs:documentation>P101</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>101</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-					<vectoParam:component>TorqueConverter</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:double"/>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterSpeedRatioType">
-		<xs:annotation>
-			<xs:documentation>P099</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>99</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>TorqueConverter</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="20"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterTorqueRatioType">
-		<xs:annotation>
-			<xs:documentation>P100</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>100</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>TorqueConverter</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="5"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleAxleConfigurationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="AxleConfiguration">037</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P037</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="4x2"/>
-			<xs:enumeration value="4x4"/>
-			<xs:enumeration value="6x2"/>
-			<xs:enumeration value="6x4"/>
-			<xs:enumeration value="6x6"/>
-			<xs:enumeration value="8x2"/>
-			<xs:enumeration value="8x4"/>
-			<xs:enumeration value="8x6"/>
-			<xs:enumeration value="8x8"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleCategoryType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="VehicleCategory">036</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P036 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Rigid Truck"/>
-			<xs:enumeration value="Tractor"/>
-			<xs:enumeration value="City Bus"/>
-			<xs:enumeration value="Interurban Bus"/>
-			<xs:enumeration value="Coach"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleCdxAType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="CdxA">146</vectoParam:parameterId>
-					<vectoParam:comment>In Declaration Mode a fixed amound is added for cycles simulated with trailer</vectoParam:comment>
-					<vectoParam:unit>m²</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P146, 147 - [m²]  Drag Coefficient * Cross Sectional Area</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0.9"/>
-			<xs:maxInclusive value="15"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleCurbWeightChassisType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="CurbWeightChassis">038</vectoParam:parameterId>
-					<vectoParam:unit>kg</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P038 - [kg]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="500"/>
-			<xs:maxInclusive value="40000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleGrossVehicleMassType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="GrossVehicleMass">041</vectoParam:parameterId>
-					<vectoParam:unit>kg</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P041 - [kg]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="3500"/>
-			<xs:maxInclusive value="40000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="WheelsDimensionType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="Dimension">108</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Wheels</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P108 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="9 R22.5"/>
-			<xs:enumeration value="9.00 R20"/>
-			<xs:enumeration value="9.5 R17.5"/>
-			<xs:enumeration value="10 R17.5"/>
-			<xs:enumeration value="10 R22.5"/>
-			<xs:enumeration value="10.00 R20"/>
-			<xs:enumeration value="11 R22.5"/>
-			<xs:enumeration value="11.00 R20"/>
-			<xs:enumeration value="11.00 R22"/>
-			<xs:enumeration value="12 R22.5"/>
-			<xs:enumeration value="12.00 R20"/>
-			<xs:enumeration value="12.00 R24"/>
-			<xs:enumeration value="12.5 R20"/>
-			<xs:enumeration value="13 R22.5"/>
-			<xs:enumeration value="14.00 R20"/>
-			<xs:enumeration value="14.5 R20"/>
-			<xs:enumeration value="16.00 R20"/>
-			<xs:enumeration value="205/75 R17.5"/>
-			<xs:enumeration value="215/75 R17.5"/>
-			<xs:enumeration value="225/70 R17.5"/>
-			<xs:enumeration value="225/75 R17.5"/>
-			<xs:enumeration value="235/75 R17.5"/>
-			<xs:enumeration value="245/70 R17.5"/>
-			<xs:enumeration value="245/70 R19.5"/>
-			<xs:enumeration value="255/70 R22.5"/>
-			<xs:enumeration value="265/70 R17.5"/>
-			<xs:enumeration value="265/70 R19.5"/>
-			<xs:enumeration value="275/70 R22.5"/>
-			<xs:enumeration value="275/80 R22.5"/>
-			<xs:enumeration value="285/60 R22.5"/>
-			<xs:enumeration value="285/70 R19.5"/>
-			<xs:enumeration value="295/55 R22.5"/>
-			<xs:enumeration value="295/60 R22.5"/>
-			<xs:enumeration value="295/80 R22.5"/>
-			<xs:enumeration value="305/60 R22.5"/>
-			<xs:enumeration value="305/70 R19.5"/>
-			<xs:enumeration value="305/70 R22.5"/>
-			<xs:enumeration value="305/75 R24.5"/>
-			<xs:enumeration value="315/45 R22.5"/>
-			<xs:enumeration value="315/60 R22.5"/>
-			<xs:enumeration value="315/70 R22.5"/>
-			<xs:enumeration value="315/80 R22.5"/>
-			<xs:enumeration value="325/95 R24"/>
-			<xs:enumeration value="335/80 R20"/>
-			<xs:enumeration value="355/50 R22.5"/>
-			<xs:enumeration value="365/70 R22.5"/>
-			<xs:enumeration value="365/80 R20"/>
-			<xs:enumeration value="365/85 R20"/>
-			<xs:enumeration value="375/45 R22.5"/>
-			<xs:enumeration value="375/50 R22.5"/>
-			<xs:enumeration value="375/90 R22.5"/>
-			<xs:enumeration value="385/55 R22.5"/>
-			<xs:enumeration value="385/65 R22.5"/>
-			<xs:enumeration value="395/85 R20"/>
-			<xs:enumeration value="425/65 R22.5"/>
-			<xs:enumeration value="495/45 R22.5"/>
-			<xs:enumeration value="525/65 R22.5"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="WheelsFzISOType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="FzISO">047</vectoParam:parameterId>
-					<vectoParam:unit>N</vectoParam:unit>
-					<vectoParam:component>Wheels</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P047 - [N]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="5000"/>
-			<xs:maxInclusive value="100000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="WheelsRimType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description status="deprecated">
-					<vectoParam:parameterId name="Rim">117</vectoParam:parameterId>
-					<vectoParam:comment>driven axle rims</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Wheels</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P117 - enum  (driven axle rims)</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="5° DC Rims"/>
-			<xs:enumeration value="15° DC Rims"/>
-			<xs:enumeration value="Multipurpose - Radial"/>
-			<xs:enumeration value="Multipurpose - Diagonal"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="WheelsRRCISOType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId name="RRCISO">046</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Wheels</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P046 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0.003"/>
-			<xs:maxInclusive value="0.015"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:group name="GeneralComponentDataElements">
-		<xs:sequence>
-			<xs:element name="Vendor">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:minLength value="5"/>
-						<xs:whiteSpace value="preserve"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="Creator">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:minLength value="10"/>
-						<xs:whiteSpace value="preserve"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="Date">
-				<xs:simpleType>
-					<xs:restriction base="tns:DateTimeWithTimezone">
-						<xs:minInclusive value="2016-01-01T00:00:00Z"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="MakeAndModel">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:minLength value="10"/>
-						<xs:whiteSpace value="preserve"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="TypeId">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:minLength value="10"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="AppVersion" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:minLength value="5"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-	</xs:group>
-	<xs:simpleType name="PTOTypeType">
-		<xs:annotation>
-			<xs:documentation>P186 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId>186</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-					<vectoParam:component>Vehicle</vectoParam:component>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="only the drive shaft of the PTO - shift claw, synchronizer, Schieberad"/>
-			<xs:enumeration value="only the drive shaft of the PTO - multi-disc clutch"/>
-			<xs:enumeration value="only the drive shaft of the PTO - multi-disc clutch, oil pump"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, Schieberad"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels - multi-disc clutch"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, Schieberad"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels - multi-disc clutch"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump"/>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
deleted file mode 100644
index 7f98a4b95ae666c5d1ecad0179579da34b3d1748..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
+++ /dev/null
@@ -1,2543 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<?xml-stylesheet type="text/xsl" href="../RenderTable.xslt"?>
-<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8" 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#" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8" 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:complexType name="AirDragComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AirDragDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AirDragDataDeclarationType">
-		<xs:sequence>
-			<xs:element name="Manufacturer" type="tns:ManufacturerType">
-				<xs:annotation>
-					<xs:documentation>P240</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Model" type="tns:ModelType">
-				<xs:annotation>
-					<xs:documentation>P241</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-				<xs:annotation>
-					<xs:documentation>P242</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Date" type="tns:DateTimeWithTimezone">
-				<xs:annotation>
-					<xs:documentation>P243</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AppVersion" type="tns:AppVersionType">
-				<xs:annotation>
-					<xs:documentation>P244</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CdxA_0" type="tns:AirdragCdxAType">
-				<xs:annotation>
-					<xs:documentation>P245 - [m²]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TransferredCdxA" type="tns:AirdragCdxAType">
-				<xs:annotation>
-					<xs:documentation>P246 - [m²]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DeclaredCdxA" type="tns:AirdragCdxAType">
-				<xs:annotation>
-					<xs:documentation>P146 - [m²]  Drag coefficient * Cross Sectional Area (Truck &amp; Trailer)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="id"/>
-	</xs:complexType>
-	<xs:complexType name="AngledriveComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AngledriveDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AngledriveDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P220</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P221</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P222</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P223</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P224</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Ratio" type="tns:AngledriveRatioType">
-						<xs:annotation>
-							<xs:documentation>P176 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CertificationMethod" type="tns:AngledriveCertificationOptionType">
-						<xs:annotation>
-							<xs:documentation>P258 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TorqueLossMap">
-						<xs:complexType>
-							<xs:sequence minOccurs="4" maxOccurs="unbounded">
-								<xs:element name="Entry" type="tns:AngledriveLossMapEntryType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AngledriveLossMapEntryType">
-		<xs:attribute name="inputSpeed" type="tns:AngledriveInputSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P173 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorque" type="tns:AngledriveInputTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P174 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:AngledriveTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P175 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesBaseType">
-		<xs:annotation>
-			<xs:documentation>Auxiliaries</xs:documentation>
-		</xs:annotation>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AuxiliariesDataDeclarationType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:AuxiliariesBaseType">
-				<xs:sequence>
-					<xs:element name="Fan">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxFanTechnologyType">
-									<xs:annotation>
-										<xs:documentation>P181</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="SteeringPump">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxSPTechnologyType" maxOccurs="4">
-									<xs:annotation>
-										<xs:documentation>P182</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="ElectricSystem">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxESTechnologyType">
-									<xs:annotation>
-										<xs:documentation>P183</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="PneumaticSystem">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxPSTechnologyType">
-									<xs:annotation>
-										<xs:documentation>P184</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="HVAC">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Technology" type="tns:AuxHVACTechnologyType">
-									<xs:annotation>
-										<xs:documentation>P185</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AxleDeclarationType">
-		<xs:sequence>
-			<xs:element name="AxleType" type="tns:AxleTypeDeclarationType">
-				<xs:annotation>
-					<xs:documentation>P154 - enum</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TwinTyres" type="tns:AxleTwinTyresType">
-				<xs:annotation>
-					<xs:documentation>P045 - bool</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Steered" type="tns:AxleSteeredType">
-				<xs:annotation>
-					<xs:documentation>P195 - bool</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tyre">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tns:TyreDeclarationType">
-							<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-								<xs:annotation>
-									<xs:documentation>P267 - [-]</xs:documentation>
-								</xs:annotation>
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="axleNumber" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:int">
-					<xs:minInclusive value="1"/>
-					<xs:maxInclusive value="4"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AxlegearComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AxlegearDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AxlegearDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Axlegear Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P215</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P216</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P217</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P218</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P219</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="LineType" type="tns:AxlegearLineTypeType">
-						<xs:annotation>
-							<xs:documentation>P253 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Ratio" type="tns:AxlegearRatioType">
-						<xs:annotation>
-							<xs:documentation>P150 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CertificationMethod" type="tns:AxlegearCertificationOptionType">
-						<xs:annotation>
-							<xs:documentation>P256 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TorqueLossMap">
-						<xs:complexType>
-							<xs:sequence minOccurs="4" maxOccurs="unbounded">
-								<xs:element name="Entry" type="tns:AxlegearTorqueLossMapEntryType"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AxlegearTorqueLossMapEntryType">
-		<xs:attribute name="inputSpeed" type="tns:AxlegearInputSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P151 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorque" type="tns:AxlegearInputTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P152 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:AxlegearTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P153 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AxlegearTorqueLossMapType"/>
-	<xs:complexType name="AxleWheelsComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:AxleWheelsDataDeclarationType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AxleWheelsDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Axles &amp; Wheels Component</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Axles">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Axle" type="tns:AxleDeclarationType" minOccurs="2" maxOccurs="4"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="DeclarationPowertrainComponentType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="tns:VectoSimulationComponent"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="EngineComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:EngineDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="EngineDataBaseType">
-		<xs:annotation>
-			<xs:documentation>Engine Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="EngineDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:EngineDataBaseType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P200</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P201</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P202</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P203</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P204</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Displacement" type="tns:EngineDisplacementType" nillable="false">
-						<xs:annotation>
-							<xs:documentation>P061 - [cm³]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IdlingSpeed" type="tns:EngineDeclaredSpeedType">
-						<xs:annotation>
-							<xs:documentation>P063 - [1/min]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RatedSpeed" type="tns:EngineDeclaredSpeedType">
-						<xs:annotation>
-							<xs:documentation>P249 - [1/min]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RatedPower" type="tns:EngineRatedPower">
-						<xs:annotation>
-							<xs:documentation>P250 - [W]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaxEngineTorque" type="tns:EngineMaxTorque">
-						<xs:annotation>
-							<xs:documentation>P259 - [Nm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="WHTCUrban" type="tns:EngineWHTCType">
-						<xs:annotation>
-							<xs:documentation>P109 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="WHTCRural" type="tns:EngineWHTCType">
-						<xs:annotation>
-							<xs:documentation>P110 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="WHTCMotorway" type="tns:EngineWHTCType">
-						<xs:annotation>
-							<xs:documentation>P111 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="BFColdHot" type="tns:EngineColdHotBalancingFactorType">
-						<xs:annotation>
-							<xs:documentation>P159 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CFRegPer" type="tns:EngineCFRegPerType">
-						<xs:annotation>
-							<xs:documentation>P192 [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CFNCV" type="tns:EngineNCVCFType">
-						<xs:annotation>
-							<xs:documentation>P260 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="FuelType" type="tns:FuelTypeType">
-						<xs:annotation>
-							<xs:documentation>P193 [enum]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="FuelConsumptionMap">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="FullLoadAndDragCurve">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="EngineStartStopDeclarationType">
-		<xs:sequence>
-			<xs:element name="Enabled" type="tns:ADASEngineStartStopEnabled">
-				<xs:annotation>
-					<xs:documentation>P010 </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="FuelConsumptionEntryType">
-		<xs:attribute name="engineSpeed" type="tns:EngineSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P072 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torque" type="tns:EngineFuelConsumptionMapTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P073 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="fuelConsumption" type="tns:EngineFuelConsumptionMapFuelConsumptionType" use="required">
-			<xs:annotation>
-				<xs:documentation>P074 - [g/h]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="FullLoadAndDragCurveEntryType">
-		<xs:attribute name="engineSpeed" type="tns:EngineSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P068 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="maxTorque" type="tns:EngineFLDMaxTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P069 - [N]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="dragTorque" type="tns:EngineFLDDragTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P070 - [N]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="FullLoadCurveType"/>
-	<xs:complexType name="GearBaseType">
-		<xs:sequence>
-			<xs:element name="Ratio" type="tns:GearboxGearRatioType">
-				<xs:annotation>
-					<xs:documentation>P078 - [-]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="number" type="tns:GearboxGearNumberType" use="required">
-			<xs:annotation>
-				<xs:documentation>P199 - [-]</xs:documentation>
-				<xs:appinfo>
-				</xs:appinfo>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="GearboxComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:GearboxDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType" minOccurs="0"/>
-			<xs:element name="TorqueConverter" minOccurs="0">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tns:TorqueConverterComponentDeclarationType">
-							<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-								<xs:annotation>
-									<xs:documentation>P263 - [-]</xs:documentation>
-								</xs:annotation>
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GearboxDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Gearbox Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P205</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P206</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P207</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P208</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P209</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TransmissionType" type="tns:GearboxTransmissionTypeType">
-						<xs:annotation>
-							<xs:documentation>P076 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MainCertificationMethod" type="tns:GearboxCertificationOptionType">
-						<xs:annotation>
-							<xs:documentation>P254 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Gears">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Gear" type="tns:GearDeclarationType" maxOccurs="99"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="GearDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:GearBaseType">
-				<xs:sequence>
-					<xs:element name="MaxTorque" type="tns:GearboxGearMaxTorqueType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P157 - [Nm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaxSpeed" type="tns:GearboxGearMaxSpeedType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P194 - [1/min]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TorqueLossMap">
-						<xs:complexType>
-							<xs:complexContent>
-								<xs:extension base="tns:TorqueLossMapType">
-									<xs:sequence>
-										<xs:element name="Entry" type="tns:TorqueLossMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
-									</xs:sequence>
-								</xs:extension>
-							</xs:complexContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="RetarderComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:RetarderDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="RetarderDataDeclarationType">
-		<xs:annotation>
-			<xs:documentation>Retarder Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P225</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P226</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P227</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P228</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P229</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CertificationMethod" type="tns:RetarderCertificationOptionType">
-						<xs:annotation>
-							<xs:documentation>P255 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RetarderLossMap">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:RetarderLossmapEntryType" minOccurs="2" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="RetarderLossmapEntryType">
-		<xs:attribute name="retarderSpeed" type="tns:RetarderSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P057 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:RetarderTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P058 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="SignatureType">
-		<xs:annotation>
-			<xs:documentation>Placeholder (so far)</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="di:Reference"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TorqueConverterCharacteristicsEntryType">
-		<xs:attribute name="speedRatio" type="tns:TorqueConverterSpeedRatioType" use="required">
-			<xs:annotation>
-				<xs:documentation>P099 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueRatio" type="tns:TorqueConverterTorqueRatioType" use="required">
-			<xs:annotation>
-				<xs:documentation>P100 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorqueRef" type="tns:TorqueConverterInputTorqueRefType" use="required">
-			<xs:annotation>
-				<xs:documentation>P101 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="TorqueConverterComponentDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:TorqueConverterDeclarationDataType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TorqueConverterDeclarationDataType">
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P210</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P211</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P212</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P213</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P214</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CertificationMethod" type="tns:TorqueConverterCertificationOptionType">
-						<xs:annotation>
-							<xs:documentation>P257 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Characteristics">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Entry" type="tns:TorqueConverterCharacteristicsEntryType" minOccurs="2" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="TorqueLimitsEntryType">
-		<xs:attribute name="gear" type="tns:GearboxGearNumberType" use="required">
-			<xs:annotation>
-				<xs:documentation>P196 - [-]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="maxTorque" type="tns:TorqueLimitEntryMaxTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P197 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="TorqueLimitsType">
-		<xs:sequence maxOccurs="unbounded">
-			<xs:element name="Entry" type="tns:TorqueLimitsEntryType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TorqueLossMapEntryType">
-		<xs:attribute name="inputSpeed" type="tns:GearboxGearInputSpeedType" use="required">
-			<xs:annotation>
-				<xs:documentation>P096 - [1/min]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="inputTorque" type="tns:GearboxGearInputTorqueType" use="required">
-			<xs:annotation>
-				<xs:documentation>P097 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="torqueLoss" type="tns:GearboxGearTorqueLossType" use="required">
-			<xs:annotation>
-				<xs:documentation>P098 - [Nm]</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="TorqueLossMapType"/>
-	<xs:complexType name="TyreDataDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P230</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P231</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TechnicalReportId" type="tns:TechnicalReportIdType">
-						<xs:annotation>
-							<xs:documentation>P232</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P233</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AppVersion" type="tns:AppVersionType">
-						<xs:annotation>
-							<xs:documentation>P234</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Dimension" type="tns:TyreDimensionType">
-						<xs:annotation>
-							<xs:documentation>P108 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RRCDeclared" type="tns:TyreRRCISOType">
-						<xs:annotation>
-							<xs:documentation>P046 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="FzISO" type="tns:TyreFzISOType">
-						<xs:annotation>
-							<xs:documentation>P047 - [N]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="TyreDeclarationType">
-		<xs:sequence>
-			<xs:element name="Data" type="tns:TyreDataDeclarationType"/>
-			<xs:element name="Signature" type="tns:SignatureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="VectoDeclarationJobType">
-		<xs:sequence>
-			<xs:element name="Vehicle">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tns:VehicleDeclarationType"/>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="schemaVersion" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:decimal">
-					<xs:minExclusive value="0"/>
-					<xs:fractionDigits value="1"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="VectoSimulationComponent" abstract="true">
-		<xs:attribute name="id" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NCName">
-					<xs:minLength value="1"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="VehicleBaseType">
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
-				<xs:sequence>
-					<xs:element name="Manufacturer" type="tns:ManufacturerType">
-						<xs:annotation>
-							<xs:documentation>P235</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ManufacturerAddress" type="tns:ManufacturerAddressType">
-						<xs:annotation>
-							<xs:documentation>P252</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Model" type="tns:ModelType">
-						<xs:annotation>
-							<xs:documentation>P236</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="VIN" type="tns:VINType">
-						<xs:annotation>
-							<xs:documentation>P238</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Date" type="tns:DateTimeWithTimezone">
-						<xs:annotation>
-							<xs:documentation>P239</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="LegislativeClass" type="tns:LegislativeClassDeclarationType">
-						<xs:annotation>
-							<xs:documentation>P251 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="VehicleCategory" type="tns:VehicleCategoryDeclarationType">
-						<xs:annotation>
-							<xs:documentation>P036 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AxleConfiguration" type="tns:VehicleAxleConfigurationDeclarationType">
-						<xs:annotation>
-							<xs:documentation>P037 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CurbMassChassis" type="tns:VehicleCurbMassChassisType">
-						<xs:annotation>
-							<xs:documentation>P038 - [kg]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="GrossVehicleMass" type="tns:VehicleGrossVehicleMassType">
-						<xs:annotation>
-							<xs:documentation>P041 - [kg]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IdlingSpeed" type="tns:EngineDeclaredSpeedType">
-						<xs:annotation>
-							<xs:documentation>P198 - [1/min]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RetarderType" type="tns:RetarderTypeType">
-						<xs:annotation>
-							<xs:documentation>P052 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RetarderRatio" type="tns:RetarderRatioType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P053 - [-]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AngledriveType" type="tns:AngledriveTypeType">
-						<xs:annotation>
-							<xs:documentation>P180 - enum</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PTO">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="PTOShaftsGearWheels" type="tns:PTOShaftsGearWheelsType">
-									<xs:annotation>
-										<xs:documentation>P247 - enum</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element name="PTOOtherElements" type="tns:PTOOtherElementsType">
-									<xs:annotation>
-										<xs:documentation>P248 - enum</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="VehicleDeclarationType">
-		<xs:complexContent>
-			<xs:extension base="tns:VehicleBaseType">
-				<xs:sequence>
-					<xs:element name="TorqueLimits" type="tns:TorqueLimitsType" minOccurs="0"/>
-					<xs:element name="Components">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Engine">
-									<xs:complexType>
-										<xs:complexContent>
-											<xs:extension base="tns:EngineComponentDeclarationType">
-												<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-													<xs:annotation>
-														<xs:documentation>P261 - [-]</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:complexContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="Gearbox">
-									<xs:complexType>
-										<xs:complexContent>
-											<xs:extension base="tns:GearboxComponentDeclarationType">
-												<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-													<xs:annotation>
-														<xs:documentation>P262 - [-]</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:complexContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="Angledrive" minOccurs="0">
-									<xs:complexType>
-										<xs:complexContent>
-											<xs:extension base="tns:AngledriveComponentDeclarationType">
-												<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-													<xs:annotation>
-														<xs:documentation>P265 - [-]</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:complexContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="Retarder" minOccurs="0">
-									<xs:complexType>
-										<xs:complexContent>
-											<xs:extension base="tns:RetarderComponentDeclarationType">
-												<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-													<xs:annotation>
-														<xs:documentation>P266 - [-]</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:complexContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="Axlegear">
-									<xs:complexType>
-										<xs:complexContent>
-											<xs:extension base="tns:AxlegearComponentDeclarationType">
-												<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-													<xs:annotation>
-														<xs:documentation>P264 - [-]</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:complexContent>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
-								<xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
-								<xs:element name="AirDrag" minOccurs="0">
-									<xs:complexType>
-										<xs:complexContent>
-											<xs:extension base="tns:AirDragComponentDeclarationType">
-												<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
-													<xs:annotation>
-														<xs:documentation>P268 - [-]</xs:documentation>
-													</xs:annotation>
-												</xs:attribute>
-											</xs:extension>
-										</xs:complexContent>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:simpleType name="ADASEngineStartStopEnabled">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="ADAS">010</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P010 - bool</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="ADASOverspeedModeDeclarationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="ADAS">015</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P015 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Overspeed"/>
-			<xs:enumeration value="EcoRoll"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AirdragCdxAType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Airdrag">245</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">246</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">146</vectoParam:parameterId>
-					<vectoParam:comment>In Declaration Mode a fixed amound is added for cycles simulated with trailer</vectoParam:comment>
-					<vectoParam:unit>m²</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P146, 147 - [m²]  Drag Coefficient * Cross Sectional Area</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minExclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveCertificationOptionType">
-		<xs:annotation>
-			<xs:documentation>P258 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Angledrive">258</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Option 1"/>
-			<xs:enumeration value="Option 2"/>
-			<xs:enumeration value="Option 3"/>
-			<xs:enumeration value="Standard values"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Angledrive/Lossmap">173</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P173</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveInputTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Angledrive/Lossmap">174</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P174</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2"/>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Angledrive">176</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P176</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double3">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Angledrive/Lossmap">175</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P175</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AngledriveTypeType">
-		<xs:annotation>
-			<xs:documentation>P180</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">180</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Losses included in Gearbox"/>
-			<xs:enumeration value="Separate Angledrive"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AppVersionType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">204</vectoParam:parameterId>
-					<vectoParam:parameterId component="Gearbox">209</vectoParam:parameterId>
-					<vectoParam:parameterId component="Torqueconverter">214</vectoParam:parameterId>
-					<vectoParam:parameterId component="Axlegear">219</vectoParam:parameterId>
-					<vectoParam:parameterId component="Angledrive">224</vectoParam:parameterId>
-					<vectoParam:parameterId component="Retarder">229</vectoParam:parameterId>
-					<vectoParam:parameterId component="Tyre">234</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">244</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:minLength value="5"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxESTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P183</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries">183</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Standard technology"/>
-			<xs:enumeration value="Standard technology - LED headlights, all"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxFanTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P181</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries">181</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
-			<xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Crankshaft mounted - Discrete step clutch"/>
-			<xs:enumeration value="Crankshaft mounted - On/off clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/>
-			<xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
-			<xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
-			<xs:enumeration value="Electrically driven - Electronically controlled"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxHVACTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P185</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries">185</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Default"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxiliaryTechlistEntryType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries" status="deprecated">143</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>DEPRECATED  - P143 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="LED lights"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxiliaryTechnologyType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries" status="deprecated">118</vectoParam:parameterId>
-					<vectoParam:comment>Valid technology selection depends on the Auxiliary Type (P005)</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>DEPRECATED  - P118 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Default"/>
-			<xs:enumeration value="Fixed displacement"/>
-			<xs:enumeration value="Variable displacement"/>
-			<xs:enumeration value="Hydraulic supported by electric"/>
-			<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch (Default)"/>
-			<xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Crankshaft mounted - Discrete step clutch"/>
-			<xs:enumeration value="Crankshaft mounted - On/Off clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch"/>
-			<xs:enumeration value="Belt driven or driven via transm. - On/Off clutch"/>
-			<xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
-			<xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
-			<xs:enumeration value="Hydraulic driven - Electronically controlled"/>
-			<xs:enumeration value="Custom Technology List"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxiliaryTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries" status="deprecated">005</vectoParam:parameterId>
-					<vectoParam:comment>List of auxiliary types predefined in delcaration mode, Technology (P118) and TechList (P143) must be specified</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>DEPRECATED  - P005 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fan"/>
-			<xs:enumeration value="Steering pump"/>
-			<xs:enumeration value="HVAC"/>
-			<xs:enumeration value="Pneumatic System"/>
-			<xs:enumeration value="Electric System"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxPSTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P184</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries">184</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Small"/>
-			<xs:enumeration value="Small + ESS"/>
-			<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 + 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 + 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 + 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"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AuxSPTechnologyType">
-		<xs:annotation>
-			<xs:documentation>P182</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Auxiliaries">182</vectoParam:parameterId>
-					<vectoParam:comment>Multiple entires allowed, one per steered axle</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fixed displacement"/>
-			<xs:enumeration value="Fixed displacement with elec. control"/>
-			<xs:enumeration value="Dual displacement"/>
-			<xs:enumeration value="Variable displacement mech. controlled"/>
-			<xs:enumeration value="Variable displacement elec. controlled"/>
-			<xs:enumeration value="Electric"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearCertificationOptionType">
-		<xs:annotation>
-			<xs:documentation>P256 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Axlegear">256</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Measured"/>
-			<xs:enumeration value="Standard values"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Axlegear/Lossmap">151</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P151 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearInputTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Axlegear/Lossmap">152</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P152 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2"/>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearLineTypeType">
-		<xs:annotation>
-			<xs:documentation>P253 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Axlegear">253</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Single reduction axle"/>
-			<xs:enumeration value="Single portal axle"/>
-			<xs:enumeration value="Hub reduction axle"/>
-			<xs:enumeration value="Single reduction tandem axle"/>
-			<xs:enumeration value="Hub reduction tandem axle"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Axlegear">150</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P150 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double3">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxlegearTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Axlegear/Lossmap">153</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P153 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxleSteeredType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Axle">195</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P195 - bool</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="AxleTwinTyresType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Axle">045</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P045 - bool</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="AxleTypeDeclarationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Axle">154</vectoParam:parameterId>
-					<vectoParam:comment>Trailer axles must not be specified in declaration mode!</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P154 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:AxleTypeType">
-			<xs:enumeration value="VehicleNonDriven"/>
-			<xs:enumeration value="VehicleDriven"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AxleTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/Axle">154</vectoParam:parameterId>
-					<vectoParam:comment>Trailer axles must not be specified in declaration mode!</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P154 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="VehicleNonDriven"/>
-			<xs:enumeration value="VehicleDriven"/>
-			<xs:enumeration value="Trailer"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="CertificationNumberType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">261</vectoParam:parameterId>
-					<vectoParam:parameterId component="Gearbox">262</vectoParam:parameterId>
-					<vectoParam:parameterId component="Torqueconverter">263</vectoParam:parameterId>
-					<vectoParam:parameterId component="Axlegear">264</vectoParam:parameterId>
-					<vectoParam:parameterId component="Angledrive">265</vectoParam:parameterId>
-					<vectoParam:parameterId component="Retarder">266</vectoParam:parameterId>
-					<vectoParam:parameterId component="Tyre">267</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">268</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P261, P262, P263, P264, P265, P266, P267, P268</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<xs:simpleType name="DateTimeWithTimezone">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">203</vectoParam:parameterId>
-					<vectoParam:parameterId component="Gearbox">208</vectoParam:parameterId>
-					<vectoParam:parameterId component="Torqueconverter">213</vectoParam:parameterId>
-					<vectoParam:parameterId component="Axlegear">218</vectoParam:parameterId>
-					<vectoParam:parameterId component="Angledrive">223</vectoParam:parameterId>
-					<vectoParam:parameterId component="Retarder">228</vectoParam:parameterId>
-					<vectoParam:parameterId component="Tyre">233</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">243</vectoParam:parameterId>
-					<vectoParam:parameterId component="Vehicle">239</vectoParam:parameterId>
-					<vectoParam:comment>Date and time when the component-hash is created</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:dateTime">
-			<xs:minInclusive value="2017-01-01T00:00:00Z"/>
-			<xs:pattern value=".+T.+Z"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="Double2">
-		<xs:annotation>
-			<xs:documentation>
-VALID: 23.00, 0.12, 12.12, 0.00, -0.12, 12345.01
-INVALID: 1.2345, .1234, 01.23
-ToDo: -0.00
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:pattern value="[-]?([1-9][0-9]*|0)\.[0-9]{2}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="Double3">
-		<xs:restriction base="xs:double">
-			<xs:pattern value="[-]?([1-9][0-9]*|0)\.[0-9]{3}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="Double4">
-		<xs:restriction base="xs:double">
-			<xs:pattern value="[-]?([1-9][0-9]*|0)\.[0-9]{4}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="Double5">
-		<xs:restriction base="xs:double">
-			<xs:pattern value="[-]?([1-9][0-9]*|0)\.[0-9]{5}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="Double6">
-		<xs:restriction base="xs:double">
-			<xs:pattern value="[-]?([1-9][0-9]*|0)\.[0-9]{6}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineCFRegPerType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">192</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="tns:Double4">
-			<xs:minInclusive value="1.0000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineColdHotBalancingFactorType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">159</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P159 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double4">
-			<xs:minInclusive value="1.0000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineDeclaredSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">063</vectoParam:parameterId>
-					<vectoParam:parameterId component="Vehicle">198</vectoParam:parameterId>
-					<vectoParam:parameterId component="Engine">249</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P063, P249 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineDisplacementType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">061</vectoParam:parameterId>
-					<vectoParam:unit>cm³</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P061 - [cm³]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFLDDragTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine/FLD">070</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P070 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:maxInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFLDMaxTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine/FLD">069</vectoParam:parameterId>
-					<vectoParam:parameterId component="Engine/FLD" status="deprecated">158</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P069 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFuelConsumptionMapFuelConsumptionType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine/FC-map">074</vectoParam:parameterId>
-					<vectoParam:unit>g/h</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P074 - [g/h]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineFuelConsumptionMapTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine/FC-map">073</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P073 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2"/>
-	</xs:simpleType>
-	<xs:simpleType name="EngineMaxTorque">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">259</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P259</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int"/>
-	</xs:simpleType>
-	<xs:simpleType name="EngineNCVCFType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">260</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P260</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double4"/>
-	</xs:simpleType>
-	<xs:simpleType name="EngineRatedPower">
-		<xs:annotation>
-			<xs:documentation>P250</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">250</vectoParam:parameterId>
-					<vectoParam:unit>W</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine/FLD">068</vectoParam:parameterId>
-					<vectoParam:parameterId component="Engine/FC-map">072</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P068, P072 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minExclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EngineWHTCType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">109</vectoParam:parameterId>
-					<vectoParam:parameterId component="Engine">110</vectoParam:parameterId>
-					<vectoParam:parameterId component="Engine">111</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P109 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double4">
-			<xs:minInclusive value="1.0000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="FuelTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">193</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Diesel CI"/>
-			<xs:enumeration value="Ethanol CI"/>
-			<xs:enumeration value="Petrol PI"/>
-			<xs:enumeration value="Ethanol PI"/>
-			<xs:enumeration value="LPG"/>
-			<xs:enumeration value="NG"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxCertificationOptionType">
-		<xs:annotation>
-			<xs:documentation>P254 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox">254</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Option 1"/>
-			<xs:enumeration value="Option 2"/>
-			<xs:enumeration value="Option 3"/>
-			<xs:enumeration value="Standard values"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearFLDInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox" status="deprecated">148</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P148 - [1/min] - DEPRECATED</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="400"/>
-			<xs:maxInclusive value="5000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearFLDMaxTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox" status="deprecated">149</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P149 - [Nm] - DEPRECATED</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:maxInclusive value="10000"/>
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearInputSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear/Lossmap">096</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P096 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearInputTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear/Lossmap">097</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P097 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2"/>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearMaxSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear">194</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P097 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearMaxTorqueType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear">157</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P157 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearNumberType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear">199</vectoParam:parameterId>
-					<vectoParam:parameterId component="Vehicle/TorqueLimits">196</vectoParam:parameterId>
-					<vectoParam:comment/>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P196, P199</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear">078</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P078 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double3">
-			<xs:minExclusive value="0.000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxGearTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox/Gear/Lossmap">098</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P098 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GearboxTransmissionTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Gearbox">076</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P076 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="SMT"/>
-			<xs:enumeration value="AMT"/>
-			<xs:enumeration value="APT-S"/>
-			<xs:enumeration value="APT-P"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="LegislativeClassDeclarationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">251</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P251 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="N3"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ManufacturerAddressType">
-		<xs:annotation>
-			<xs:documentation>P252</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">252</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<xs:simpleType name="ManufacturerType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">200</vectoParam:parameterId>
-					<vectoParam:parameterId component="Gearbox">205</vectoParam:parameterId>
-					<vectoParam:parameterId component="Torqueconverter">210</vectoParam:parameterId>
-					<vectoParam:parameterId component="Axlegear">215</vectoParam:parameterId>
-					<vectoParam:parameterId component="Angledrive">220</vectoParam:parameterId>
-					<vectoParam:parameterId component="Retarder">225</vectoParam:parameterId>
-					<vectoParam:parameterId component="Tyre">230</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">240</vectoParam:parameterId>
-					<vectoParam:parameterId component="Vehicle">235</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:whiteSpace value="collapse"/>
-			<xs:minLength value="1"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ModelType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">201</vectoParam:parameterId>
-					<vectoParam:parameterId component="Gearbox">206</vectoParam:parameterId>
-					<vectoParam:parameterId component="Torqueconverter">211</vectoParam:parameterId>
-					<vectoParam:parameterId component="Axlegear">216</vectoParam:parameterId>
-					<vectoParam:parameterId component="Angledrive">221</vectoParam:parameterId>
-					<vectoParam:parameterId component="Retarder">226</vectoParam:parameterId>
-					<vectoParam:parameterId component="Tyre">231</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">241</vectoParam:parameterId>
-					<vectoParam:parameterId component="Vehicle">236</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:minLength value="1"/>
-			<xs:whiteSpace value="collapse"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PTOOtherElementsType">
-		<xs:annotation>
-			<xs:documentation>P248 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">248</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none"/>
-			<xs:enumeration value="shift claw, synchronizer, sliding gearwheel"/>
-			<xs:enumeration value="multi-disc clutch"/>
-			<xs:enumeration value="multi-disc clutch, oil pump"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PTOShaftsGearWheelsType">
-		<xs:annotation>
-			<xs:documentation>P247 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">247</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none"/>
-			<xs:enumeration value="only the drive shaft of the PTO"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels"/>
-			<xs:enumeration value="only one engaged gearwheel above oil level"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PTOTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Retarder">058</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P058 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:double">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="500"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PTOTypeType">
-		<xs:annotation>
-			<xs:documentation>P186 - enum -- DEPRECATED</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle" status="deprecated">186</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Losses included in Gearbox"/>
-			<xs:enumeration value="only the drive shaft of the PTO - shift claw, synchronizer, sliding gearwheel"/>
-			<xs:enumeration value="only the drive shaft of the PTO - multi-disc clutch"/>
-			<xs:enumeration value="only the drive shaft of the PTO - multi-disc clutch, oil pump"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, sliding gearwheel"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels - multi-disc clutch"/>
-			<xs:enumeration value="drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels - multi-disc clutch"/>
-			<xs:enumeration value="drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderCertificationOptionType">
-		<xs:annotation>
-			<xs:documentation>P255 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Retarder">255</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Measured"/>
-			<xs:enumeration value="Standard values"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderRatioType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">053</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P053 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double3">
-			<xs:minExclusive value="0.000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderSpeedType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Retarder/Lossmap">057</vectoParam:parameterId>
-					<vectoParam:unit>1/min</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P057 - [1/min]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderTorqueLossType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Retarder/Lossmap">058</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P058 - [Nm]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RetarderTypeType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">052</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P052 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Losses included in Gearbox"/>
-			<xs:enumeration value="Engine Retarder"/>
-			<xs:enumeration value="Transmission Input Retarder"/>
-			<xs:enumeration value="Transmission Output Retarder"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="SteeredAxlesType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">179</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="4"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TechnicalReportIdType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Engine">202</vectoParam:parameterId>
-					<vectoParam:parameterId component="Gearbox">207</vectoParam:parameterId>
-					<vectoParam:parameterId component="Torqueconverter">212</vectoParam:parameterId>
-					<vectoParam:parameterId component="Axlegear">217</vectoParam:parameterId>
-					<vectoParam:parameterId component="Angledrive">222</vectoParam:parameterId>
-					<vectoParam:parameterId component="Retarder">227</vectoParam:parameterId>
-					<vectoParam:parameterId component="Tyre">232</vectoParam:parameterId>
-					<vectoParam:parameterId component="Airdrag">242</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:minLength value="1"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterCertificationOptionType">
-		<xs:annotation>
-			<xs:documentation>P257 - enum</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Torqueconverter">257</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Measured"/>
-			<xs:enumeration value="Standard values"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterInputTorqueRefType">
-		<xs:annotation>
-			<xs:documentation>P101</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Torqueconverter/Characteristics">101</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2"/>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterSpeedRatioType">
-		<xs:annotation>
-			<xs:documentation>P099</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Torqueconverter/Characteristics">99</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="tns:Double4">
-			<xs:minInclusive value="0.0000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueConverterTorqueRatioType">
-		<xs:annotation>
-			<xs:documentation>P100</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Torqueconverter/Characteristics">100</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="tns:Double2">
-			<xs:minInclusive value="0.00"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TorqueLimitEntryMaxTorqueType">
-		<xs:annotation>
-			<xs:documentation>P197</xs:documentation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/TorqueLimits">197</vectoParam:parameterId>
-					<vectoParam:unit>Nm</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minExclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TyreDimensionType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Tyre">108</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P108 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="9 R22.5"/>
-			<xs:enumeration value="9.00 R20"/>
-			<xs:enumeration value="9.5 R17.5"/>
-			<xs:enumeration value="10 R17.5"/>
-			<xs:enumeration value="10 R22.5"/>
-			<xs:enumeration value="10.00 R20"/>
-			<xs:enumeration value="11 R22.5"/>
-			<xs:enumeration value="11.00 R20"/>
-			<xs:enumeration value="11.00 R22"/>
-			<xs:enumeration value="12 R22.5"/>
-			<xs:enumeration value="12.00 R20"/>
-			<xs:enumeration value="12.00 R24"/>
-			<xs:enumeration value="12.5 R20"/>
-			<xs:enumeration value="13 R22.5"/>
-			<xs:enumeration value="14.00 R20"/>
-			<xs:enumeration value="14.5 R20"/>
-			<xs:enumeration value="16.00 R20"/>
-			<xs:enumeration value="205/75 R17.5"/>
-			<xs:enumeration value="215/75 R17.5"/>
-			<xs:enumeration value="225/70 R17.5"/>
-			<xs:enumeration value="225/75 R17.5"/>
-			<xs:enumeration value="235/75 R17.5"/>
-			<xs:enumeration value="245/70 R17.5"/>
-			<xs:enumeration value="245/70 R19.5"/>
-			<xs:enumeration value="255/70 R22.5"/>
-			<xs:enumeration value="265/70 R17.5"/>
-			<xs:enumeration value="265/70 R19.5"/>
-			<xs:enumeration value="275/70 R22.5"/>
-			<xs:enumeration value="275/80 R22.5"/>
-			<xs:enumeration value="285/60 R22.5"/>
-			<xs:enumeration value="285/70 R19.5"/>
-			<xs:enumeration value="295/55 R22.5"/>
-			<xs:enumeration value="295/60 R22.5"/>
-			<xs:enumeration value="295/80 R22.5"/>
-			<xs:enumeration value="305/60 R22.5"/>
-			<xs:enumeration value="305/70 R19.5"/>
-			<xs:enumeration value="305/70 R22.5"/>
-			<xs:enumeration value="305/75 R24.5"/>
-			<xs:enumeration value="315/45 R22.5"/>
-			<xs:enumeration value="315/60 R22.5"/>
-			<xs:enumeration value="315/70 R22.5"/>
-			<xs:enumeration value="315/80 R22.5"/>
-			<xs:enumeration value="325/95 R24"/>
-			<xs:enumeration value="335/80 R20"/>
-			<xs:enumeration value="355/50 R22.5"/>
-			<xs:enumeration value="365/70 R22.5"/>
-			<xs:enumeration value="365/80 R20"/>
-			<xs:enumeration value="365/85 R20"/>
-			<xs:enumeration value="375/45 R22.5"/>
-			<xs:enumeration value="375/50 R22.5"/>
-			<xs:enumeration value="375/90 R22.5"/>
-			<xs:enumeration value="385/55 R22.5"/>
-			<xs:enumeration value="385/65 R22.5"/>
-			<xs:enumeration value="395/85 R20"/>
-			<xs:enumeration value="425/65 R22.5"/>
-			<xs:enumeration value="495/45 R22.5"/>
-			<xs:enumeration value="525/65 R22.5"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TyreFzISOType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Tyre">047</vectoParam:parameterId>
-					<vectoParam:unit>N</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P047 - [N]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="TyreRRCISOType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Tyre">046</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P046 - [-]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:Double4">
-			<xs:minInclusive value="0.0000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleAxleConfigurationDeclarationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">037</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P037</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:VehicleAxleConfigurationType">
-			<xs:enumeration value="4x2"/>
-			<xs:enumeration value="6x2"/>
-			<xs:enumeration value="6x4"/>
-			<xs:enumeration value="8x4"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleAxleConfigurationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">037</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P037</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="4x2"/>
-			<xs:enumeration value="4x4"/>
-			<xs:enumeration value="6x2"/>
-			<xs:enumeration value="6x4"/>
-			<xs:enumeration value="6x6"/>
-			<xs:enumeration value="8x2"/>
-			<xs:enumeration value="8x4"/>
-			<xs:enumeration value="8x6"/>
-			<xs:enumeration value="8x8"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleCategoryDeclarationType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P036 - enum (Declaration)</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="tns:VehicleCategoryType">
-			<xs:enumeration value="Rigid Truck"/>
-			<xs:enumeration value="Tractor"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleCategoryType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P036 - enum</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Rigid Truck"/>
-			<xs:enumeration value="Tractor"/>
-			<xs:enumeration value="City Bus"/>
-			<xs:enumeration value="Interurban Bus"/>
-			<xs:enumeration value="Coach"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleCurbMassChassisType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">038</vectoParam:parameterId>
-					<vectoParam:unit>kg</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P038 - [kg]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="500"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VehicleGrossVehicleMassType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">041</vectoParam:parameterId>
-					<vectoParam:unit>kg</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P041 - [kg]</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="3500"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="VINType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">238</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:whiteSpace value="collapse"/>
-			<xs:minLength value="1"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="WheelsRimType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Tyre" status="deprecated">117</vectoParam:parameterId>
-					<vectoParam:comment>driven axle rims</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P117 - enum  (driven axle rims)</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="5° DC Rims"/>
-			<xs:enumeration value="15° DC Rims"/>
-			<xs:enumeration value="Multipurpose - Radial"/>
-			<xs:enumeration value="Multipurpose - Diagonal"/>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 3a3a2b2dffd81bbf1d90051ff9724c06a71c01be..cf42644e2fb6879602170ac700c6c52f1af072ad 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -83,6 +83,14 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualBasic" />
@@ -361,7 +369,7 @@
     <EmbeddedResource Include="Resources\Declaration\VAUX\PS-Table.csv" />
     <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Table.csv" />
     <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Tech.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VCDV\parameters.csv" />
+    <EmbeddedResource Include="Resources\Declaration\VCDV\VCDV_parameters.csv" />
     <EmbeddedResource Include="Resources\Declaration\WHTC-Weighting-Factors.csv" />
     <EmbeddedResource Include="Resources\Declaration\VAUX\ALT-Tech.csv" />
     <EmbeddedResource Include="Resources\Declaration\Report\cyclePageTemplate.pdf" />
diff --git a/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs b/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs
index 7255209338c43f2cd066f45d750ae0e151ce406b..f2f69a3934ed59f3c61a258528b3c76426379b77 100644
--- a/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs
+++ b/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs
@@ -29,70 +29,70 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
-using System;
-using System.Diagnostics;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.InputData.Reader;
-using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
-
-namespace TUGraz.VectoCore.Tests.Dummy
-{
-	[TestClass]
-	public class EngineFLDTest
-	{
-		[TestMethod]
-		public void CompareFLDLookupPerformance()
-		{
-			var engineFile1 = @"TestData\Components\40t_Long_Haul_Truck.vfld";
-			var engineFile2 = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
-
-			if (!File.Exists(engineFile2)) {
-				Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
-			}
-
-			var map1 = FullLoadCurveReader.ReadFromFile(engineFile1, true);
-			var map2 = FullLoadCurveReader.ReadFromFile(engineFile2, true);
-
-			map1.FullLoadStationaryTorque(1000.RPMtoRad());
-			map2.FullLoadStationaryTorque(1000.RPMtoRad());
-
-			foreach (var map in new[] { map1, map2 }) {
-				var rand = new Random();
-				var stopWatch = Stopwatch.StartNew();
-
-
-				for (var i = 0; i < 500000; i++) {
-					var angularVelocity = rand.Next(1000, 1400).RPMtoRad();
-
-					var tqMax = map.FullLoadStationaryTorque(angularVelocity);
-				}
-
-				stopWatch.Stop();
-				Debug.Print("{0}", stopWatch.ElapsedMilliseconds);
-			}
-		}
-
-		[TestMethod]
-		public void LookupTest()
-		{
-			var engineFile2 = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
-
-			if (!File.Exists(engineFile2)) {
-				Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
-			}
-
-			var map = FullLoadCurveReader.ReadFromFile(engineFile2, true);
-
-			Assert.AreEqual(1208, map.FullLoadStationaryTorque(500.RPMtoRad()).Value(), 1e-3);
-
-			Assert.AreEqual(27, map.FullLoadStationaryTorque(2202.RPMtoRad()).Value(), 1e-3);
-
-			Assert.AreEqual(2341.5714, map.FullLoadStationaryTorque(1500.RPMtoRad()).Value(), 1e-3);
-			Assert.AreEqual(376.7142, map.FullLoadStationaryTorque(2175.RPMtoRad()).Value(), 1e-3);
-
-			Assert.AreEqual(1544, map.FullLoadStationaryTorque(628.RPMtoRad()).Value(), 1e-3);
-		}
-	}
-}
\ No newline at end of file
+using System;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
+
+namespace TUGraz.VectoCore.Tests.Dummy
+{
+	[TestClass]
+	public class EngineFLDTest
+	{
+		[TestMethod]
+		public void CompareFLDLookupPerformance()
+		{
+			var engineFile1 = @"TestData\Components\40t_Long_Haul_Truck.vfld";
+			var engineFile2 = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
+
+			if (!File.Exists(engineFile2)) {
+				Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
+			}
+
+			var map1 = FullLoadCurveReader.ReadFromFile(engineFile1, true);
+			var map2 = FullLoadCurveReader.ReadFromFile(engineFile2, true);
+
+			map1.FullLoadStationaryTorque(1000.RPMtoRad());
+			map2.FullLoadStationaryTorque(1000.RPMtoRad());
+
+			foreach (var map in new[] { map1, map2 }) {
+				var rand = new Random();
+				var stopWatch = Stopwatch.StartNew();
+
+
+				for (var i = 0; i < 500000; i++) {
+					var angularVelocity = rand.Next(1000, 1400).RPMtoRad();
+
+					var tqMax = map.FullLoadStationaryTorque(angularVelocity);
+				}
+
+				stopWatch.Stop();
+				Debug.Print("{0}", stopWatch.ElapsedMilliseconds);
+			}
+		}
+
+		[TestMethod]
+		public void LookupTest()
+		{
+			var engineFile2 = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
+
+			if (!File.Exists(engineFile2)) {
+				Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
+			}
+
+			var map = FullLoadCurveReader.ReadFromFile(engineFile2, true);
+
+			Assert.AreEqual(1208, map.FullLoadStationaryTorque(500.RPMtoRad()).Value(), 1e-3);
+
+			Assert.AreEqual(27, map.FullLoadStationaryTorque(2202.RPMtoRad()).Value(), 1e-3);
+
+			Assert.AreEqual(2341.5714, map.FullLoadStationaryTorque(1500.RPMtoRad()).Value(), 1e-3);
+			Assert.AreEqual(376.7142, map.FullLoadStationaryTorque(2175.RPMtoRad()).Value(), 1e-3);
+
+			Assert.AreEqual(1544, map.FullLoadStationaryTorque(628.RPMtoRad()).Value(), 1e-3);
+		}
+	}
+}
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 137e8472b04e4d474869d9b8c5b3f56e3a5f975b..789bdb1ceb513170e5885c92cba317eb8bd42173 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -35,6 +35,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">