diff --git a/src/eQuantic.Core.Api.Crud/eQuantic.Core.Api.Crud.csproj b/src/eQuantic.Core.Api.Crud/eQuantic.Core.Api.Crud.csproj
index 1029a7b..b72050c 100644
--- a/src/eQuantic.Core.Api.Crud/eQuantic.Core.Api.Crud.csproj
+++ b/src/eQuantic.Core.Api.Crud/eQuantic.Core.Api.Crud.csproj
@@ -4,7 +4,7 @@
         <Description>eQuantic API CRUD Library</Description>
         <Copyright>2023</Copyright>
         <AssemblyTitle>eQuantic.Core.Api.Crud</AssemblyTitle>
-        <Version>1.0.2.0</Version>
+        <Version>1.0.3.0</Version>
         <Authors>eQuantic Systems</Authors>
         <TargetFramework>net7.0</TargetFramework>
         <PackageId>eQuantic.Core.Api.Crud</PackageId>
@@ -22,8 +22,8 @@
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <RepositoryUrl>https://github.com/eQuantic/core-api-crud</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
-        <AssemblyVersion>1.0.2.0</AssemblyVersion>
-        <FileVersion>1.0.2.0</FileVersion>
+        <AssemblyVersion>1.0.3.0</AssemblyVersion>
+        <FileVersion>1.0.3.0</FileVersion>
         <PackageIcon>Icon.png</PackageIcon>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/eQuantic.Core.Api/Extensions/ServiceCollectionExtensions.cs b/src/eQuantic.Core.Api/Extensions/ServiceCollectionExtensions.cs
index 9adef8c..50f2416 100644
--- a/src/eQuantic.Core.Api/Extensions/ServiceCollectionExtensions.cs
+++ b/src/eQuantic.Core.Api/Extensions/ServiceCollectionExtensions.cs
@@ -18,20 +18,24 @@ public static class ServiceCollectionExtensions
     /// Adds the api documentation using the specified registry
     /// </summary>
     /// <param name="services">The service collection</param>
+    /// <param name="options">The documentation options</param>
     /// <returns>The registry</returns>
     public static IServiceCollection AddApiDocumentation(this IServiceCollection services, Action<DocumentationOptions>? options = null)
     {
         var docOptions = new DocumentationOptions();
         options?.Invoke(docOptions);
-        
-        var assembly = Assembly.GetExecutingAssembly();
-        var name = assembly.GetName().Name;
+
+        var assembly = docOptions.Assembly ?? Assembly.GetEntryAssembly();
+        var name = assembly?.GetName().Name;
         
         services.AddSwaggerGen(c =>
         {
             c.SwaggerDoc("v1", new OpenApiInfo { Title = docOptions.Title, Version = "v1" });
             c.DescribeAllParametersInCamelCase();
-            c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, $"{name}.xml"));
+            
+            if(!string.IsNullOrEmpty(name))
+                c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, $"{name}.xml"));
+            
             c.EnableAnnotations();
             c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
             {
diff --git a/src/eQuantic.Core.Api/Options/DocumentationOptions.cs b/src/eQuantic.Core.Api/Options/DocumentationOptions.cs
index 3805928..8f15f14 100644
--- a/src/eQuantic.Core.Api/Options/DocumentationOptions.cs
+++ b/src/eQuantic.Core.Api/Options/DocumentationOptions.cs
@@ -1,6 +1,9 @@
+using System.Reflection;
+
 namespace eQuantic.Core.Api.Options;
 
 public class DocumentationOptions
 {
     public string? Title { get; set; }
+    public Assembly? Assembly { get; set; }
 }
\ No newline at end of file
diff --git a/src/eQuantic.Core.Api/eQuantic.Core.Api.csproj b/src/eQuantic.Core.Api/eQuantic.Core.Api.csproj
index 8da1460..ee9ab96 100644
--- a/src/eQuantic.Core.Api/eQuantic.Core.Api.csproj
+++ b/src/eQuantic.Core.Api/eQuantic.Core.Api.csproj
@@ -4,7 +4,7 @@
         <Description>eQuantic API Library</Description>
         <Copyright>2023</Copyright>
         <AssemblyTitle>eQuantic.Core.Api</AssemblyTitle>
-        <Version>1.0.2.0</Version>
+        <Version>1.0.3.0</Version>
         <Authors>eQuantic Systems</Authors>
         <TargetFramework>net7.0</TargetFramework>
         <PackageId>eQuantic.Core.Api</PackageId>
@@ -22,8 +22,8 @@
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <RepositoryUrl>https://github.com/eQuantic/core-api-crud</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
-        <AssemblyVersion>1.0.2.0</AssemblyVersion>
-        <FileVersion>1.0.2.0</FileVersion>
+        <AssemblyVersion>1.0.3.0</AssemblyVersion>
+        <FileVersion>1.0.3.0</FileVersion>
         <PackageIcon>Icon.png</PackageIcon>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/eQuantic.Core.Application.Crud/eQuantic.Core.Application.Crud.csproj b/src/eQuantic.Core.Application.Crud/eQuantic.Core.Application.Crud.csproj
index 3373b7e..c6ee26c 100644
--- a/src/eQuantic.Core.Application.Crud/eQuantic.Core.Application.Crud.csproj
+++ b/src/eQuantic.Core.Application.Crud/eQuantic.Core.Application.Crud.csproj
@@ -4,7 +4,7 @@
         <Description>eQuantic Application CRUD Library</Description>
         <Copyright>2023</Copyright>
         <AssemblyTitle>eQuantic.Core.Application.Crud</AssemblyTitle>
-        <Version>1.0.2.0</Version>
+        <Version>1.0.3.0</Version>
         <Authors>eQuantic Systems</Authors>
         <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
         <PackageId>eQuantic.Core.Application.Crud</PackageId>
@@ -22,8 +22,8 @@
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <RepositoryUrl>https://github.com/eQuantic/core-api-crud</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
-        <AssemblyVersion>1.0.2.0</AssemblyVersion>
-        <FileVersion>1.0.2.0</FileVersion>
+        <AssemblyVersion>1.0.3.0</AssemblyVersion>
+        <FileVersion>1.0.3.0</FileVersion>
         <PackageIcon>Icon.png</PackageIcon>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/eQuantic.Core.Application/eQuantic.Core.Application.csproj b/src/eQuantic.Core.Application/eQuantic.Core.Application.csproj
index 9e26f46..c07af52 100644
--- a/src/eQuantic.Core.Application/eQuantic.Core.Application.csproj
+++ b/src/eQuantic.Core.Application/eQuantic.Core.Application.csproj
@@ -4,7 +4,7 @@
         <Description>eQuantic Application Library</Description>
         <Copyright>2023</Copyright>
         <AssemblyTitle>eQuantic.Core.Application</AssemblyTitle>
-        <Version>1.0.2.0</Version>
+        <Version>1.0.3.0</Version>
         <Authors>eQuantic Systems</Authors>
         <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
         <PackageId>eQuantic.Core.Application</PackageId>
@@ -22,8 +22,8 @@
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <RepositoryUrl>https://github.com/eQuantic/core-api-crud</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
-        <AssemblyVersion>1.0.2.0</AssemblyVersion>
-        <FileVersion>1.0.2.0</FileVersion>
+        <AssemblyVersion>1.0.3.0</AssemblyVersion>
+        <FileVersion>1.0.3.0</FileVersion>
         <PackageIcon>Icon.png</PackageIcon>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>