diff --git a/DocumentService.Application/DocumentService.Application.csproj b/DocumentService.Application/DocumentService.Application.csproj
index 14fccae..30daa7c 100644
--- a/DocumentService.Application/DocumentService.Application.csproj
+++ b/DocumentService.Application/DocumentService.Application.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net462;net480;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+	<Nullable>enable</Nullable>
+	<LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +16,7 @@
     <None Remove="Features\**" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="AutoMapper" Version="16.2.0" />
     <PackageReference Include="Codecrete.SwissQRBill.Generator" Version="3.4.0" />
     <PackageReference Include="FluentValidation" Version="12.1.1" />
@@ -25,8 +26,38 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Common\Mappings\" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="AutoMapper" Version="16.2.0" />
+    <PackageReference Include="FluentValidation" Version="11.11.0" />
+    <PackageReference Include="MediatR" Version="14.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net480'">
+    <PackageReference Include="AutoMapper" Version="16.2.0" />
+    <PackageReference Include="FluentValidation" Version="11.11.0" />
+    <PackageReference Include="MediatR" Version="14.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+    <PackageReference Include="PolySharp" Version="1.14.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+    <Compile Remove="Common\Interfaces\ISwissQrCodeProcessor.cs" />
+    <Compile Remove="Common\DTOs\SwissQrBillDto.cs" />
+    <Compile Remove="Common\DTOs\SwissQrCodeExtractionResult.cs" />
+    <Compile Remove="Common\Mapping\MappingProfile.cs" />
+    <Compile Remove="SwissQrCode\**" />
+    <Compile Remove="ExtractZugferd\**" />
+    <Compile Remove="HasZugferd\**" />
+    <Compile Remove="DependencyInjection.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DocumentService.Client/DocumentService.Client.csproj b/DocumentService.Client/DocumentService.Client.csproj
index 34defcf..cbf285d 100644
--- a/DocumentService.Client/DocumentService.Client.csproj
+++ b/DocumentService.Client/DocumentService.Client.csproj
@@ -42,5 +42,9 @@
 			<PackagePath>\</PackagePath>
 		</None>
 	</ItemGroup>
+	
+	<ItemGroup>
+	  <ProjectReference Include="..\DocumentService.Application\DocumentService.Application.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DocumentService.Client/Models/Requests/PdfOperationRequests.cs b/DocumentService.Client/Models/Requests/PdfOperationRequests.cs
index 3246772..c6b9416 100644
--- a/DocumentService.Client/Models/Requests/PdfOperationRequests.cs
+++ b/DocumentService.Client/Models/Requests/PdfOperationRequests.cs
@@ -1,4 +1,5 @@
 using DocumentService.Client.Models.ValueObjects;
+using DocumentService.Domain.Models.ValueObjects;
 
 namespace DocumentService.Client.Models.Requests;
 
diff --git a/DocumentService.Client/Models/ValueObjects/AnnotationOrigin.cs b/DocumentService.Client/Models/ValueObjects/AnnotationOrigin.cs
deleted file mode 100644
index 87643c0..0000000
--- a/DocumentService.Client/Models/ValueObjects/AnnotationOrigin.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace DocumentService.Client.Models.ValueObjects;
-
-/// <summary>
-/// Coordinate origin point for PDF annotations.
-/// </summary>
-public enum AnnotationOrigin
-{
-    /// <summary>
-    /// Bottom-left corner (PDF native coordinate system, default)
-    /// </summary>
-    BottomLeft,
-    
-    /// <summary>
-    /// Top-left corner (common in UI frameworks)
-    /// </summary>
-    TopLeft
-}
diff --git a/DocumentService.Client/Models/ValueObjects/AnnotationType.cs b/DocumentService.Client/Models/ValueObjects/AnnotationType.cs
deleted file mode 100644
index 6b5a6e3..0000000
--- a/DocumentService.Client/Models/ValueObjects/AnnotationType.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace DocumentService.Client.Models.ValueObjects;
-
-/// <summary>
-/// Supported PDF annotation types
-/// </summary>
-public enum AnnotationType
-{
-    /// <summary>
-    /// Text markup annotation (highlight, underline, strikeout)
-    /// </summary>
-    TextMarkup,
-    
-    /// <summary>
-    /// Free text annotation (text box with visible text)
-    /// </summary>
-    FreeText,
-    
-    /// <summary>
-    /// Sticky note annotation (popup comment icon)
-    /// </summary>
-    StickyNote,
-    
-    /// <summary>
-    /// Circle shape annotation
-    /// </summary>
-    Circle,
-    
-    /// <summary>
-    /// Square shape annotation
-    /// </summary>
-    Square
-}
diff --git a/DocumentService.Client/Models/ValueObjects/PredefinedStampType.cs b/DocumentService.Client/Models/ValueObjects/PredefinedStampType.cs
deleted file mode 100644
index ec43464..0000000
--- a/DocumentService.Client/Models/ValueObjects/PredefinedStampType.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace DocumentService.Client.Models.ValueObjects;
-
-/// <summary>
-/// Predefined stamp types with standard text and styling.
-/// </summary>
-public enum PredefinedStampType
-{
-    /// <summary>
-    /// CONFIDENTIAL stamp (red, bold).
-    /// </summary>
-    Confidential,
-
-    /// <summary>
-    /// APPROVED stamp (green, bold).
-    /// </summary>
-    Approved,
-
-    /// <summary>
-    /// DRAFT stamp (gray, italic).
-    /// </summary>
-    Draft,
-
-    /// <summary>
-    /// VOID stamp (red, strikethrough effect).
-    /// </summary>
-    Void,
-
-    /// <summary>
-    /// FOR REVIEW stamp (orange, bold).
-    /// </summary>
-    ForReview
-}
diff --git a/DocumentService.Client/Models/ValueObjects/StampPlacement.cs b/DocumentService.Client/Models/ValueObjects/StampPlacement.cs
deleted file mode 100644
index b0b8147..0000000
--- a/DocumentService.Client/Models/ValueObjects/StampPlacement.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace DocumentService.Client.Models.ValueObjects;
-
-/// <summary>
-/// Specifies whether the stamp should appear in the foreground or background.
-/// </summary>
-public enum StampPlacement
-{
-    /// <summary>
-    /// Stamp appears on top of existing page content.
-    /// </summary>
-    Foreground,
-
-    /// <summary>
-    /// Stamp appears behind existing page content (watermark effect).
-    /// </summary>
-    Background
-}
diff --git a/DocumentService.Client/Models/ValueObjects/StampType.cs b/DocumentService.Client/Models/ValueObjects/StampType.cs
deleted file mode 100644
index 7ccb18c..0000000
--- a/DocumentService.Client/Models/ValueObjects/StampType.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace DocumentService.Client.Models.ValueObjects;
-
-/// <summary>
-/// Specifies the type of stamp to add to a PDF document.
-/// </summary>
-public enum StampType
-{
-    /// <summary>
-    /// Text-based stamp with custom text, font, and color.
-    /// </summary>
-    Text,
-
-    /// <summary>
-    /// Image-based stamp (PNG/JPEG overlay).
-    /// </summary>
-    Image,
-
-    /// <summary>
-    /// Predefined stamp with standard text (e.g., CONFIDENTIAL, APPROVED).
-    /// </summary>
-    Predefined
-}
diff --git a/DocumentService.Client/Models/ValueObjects/TextMarkupStyle.cs b/DocumentService.Client/Models/ValueObjects/TextMarkupStyle.cs
deleted file mode 100644
index 95b19f4..0000000
--- a/DocumentService.Client/Models/ValueObjects/TextMarkupStyle.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace DocumentService.Client.Models.ValueObjects;
-
-/// <summary>
-/// Text markup annotation style (highlight, underline, strikeout)
-/// </summary>
-public enum TextMarkupStyle
-{
-    /// <summary>
-    /// Highlight text with background color
-    /// </summary>
-    Highlight,
-    
-    /// <summary>
-    /// Underline text
-    /// </summary>
-    Underline,
-    
-    /// <summary>
-    /// Strikeout text (strikethrough)
-    /// </summary>
-    Strikeout
-}