diff --git a/Hexio.EconomicClient.Tests/Hexio.EconomicClient.Tests.csproj b/Hexio.EconomicClient.Tests/Hexio.EconomicClient.Tests.csproj
index e915a60..9941e8c 100644
--- a/Hexio.EconomicClient.Tests/Hexio.EconomicClient.Tests.csproj
+++ b/Hexio.EconomicClient.Tests/Hexio.EconomicClient.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>Hexio.EconomicClient.Test</RootNamespace>
     </PropertyGroup>
 
@@ -10,13 +10,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.5" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="FluentAssertions" Version="5.10.3" />
         <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     </ItemGroup>
 
diff --git a/Hexio.EconomicClient/EconomicModule.cs b/Hexio.EconomicClient/EconomicModule.cs
new file mode 100644
index 0000000..93b6d90
--- /dev/null
+++ b/Hexio.EconomicClient/EconomicModule.cs
@@ -0,0 +1,20 @@
+using Autofac;
+
+namespace Hexio.EconomicClient
+{
+    public class EconomicModule : Module
+    {
+        private EconomicSettings Settings { get; set; }
+
+        public EconomicModule(EconomicSettings settings)
+        {
+            Settings = settings;
+        }
+        
+        protected override void Load(ContainerBuilder builder)
+        {
+            builder.Register(c => Settings);
+            builder.Register(c => EconomicClientFactory.Execute(Settings.AppSecretToken, Settings.AgreementGrantToken)).AsImplementedInterfaces().InstancePerLifetimeScope();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Hexio.EconomicClient/Hexio.EconomicClient.csproj b/Hexio.EconomicClient/Hexio.EconomicClient.csproj
index 0b4ea5a..20222c8 100644
--- a/Hexio.EconomicClient/Hexio.EconomicClient.csproj
+++ b/Hexio.EconomicClient/Hexio.EconomicClient.csproj
@@ -5,7 +5,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="RestEase" Version="1.6.4" />
+        <PackageReference Include="Autofac" Version="6.1.0" />
+        <PackageReference Include="RestEase" Version="1.5.2" />
     </ItemGroup>
 
 </Project>
diff --git a/Hexio.EconomicClient/ReadModels/InvoiceReadModel.cs b/Hexio.EconomicClient/ReadModels/InvoiceReadModel.cs
index c2d976c..cb28f28 100644
--- a/Hexio.EconomicClient/ReadModels/InvoiceReadModel.cs
+++ b/Hexio.EconomicClient/ReadModels/InvoiceReadModel.cs
@@ -44,13 +44,13 @@ public class Line
         public long? SortKey { get; set; }
         public Unit Unit { get; set; }
         public Product Product { get; set; }
-        public long? Quantity { get; set; }
-        public long? UnitNetPrice { get; set; }
-        public long? DiscountPercentage { get; set; }
-        public long? UnitCostPrice { get; set; }
-        public long? TotalNetAmount { get; set; }
-        public long? MarginInBaseCurrency { get; set; }
-        public long? MarginPercentage { get; set; }
+        public decimal? Quantity { get; set; }
+        public decimal? UnitNetPrice { get; set; }
+        public decimal? DiscountPercentage { get; set; }
+        public decimal? UnitCostPrice { get; set; }
+        public decimal? TotalNetAmount { get; set; }
+        public decimal? MarginInBaseCurrency { get; set; }
+        public decimal? MarginPercentage { get; set; }
     }
 
     public class Product