diff --git a/DigitalData.Core.Application/DIExtensions.cs b/DigitalData.Core.Application/DIExtensions.cs
index 3d8b4b5..49a30e7 100644
--- a/DigitalData.Core.Application/DIExtensions.cs
+++ b/DigitalData.Core.Application/DIExtensions.cs
@@ -1,7 +1,5 @@
-using AutoMapper;
-using DigitalData.Core.Abstractions;
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.Core.Abstractions.Application;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
@@ -13,50 +11,6 @@ namespace DigitalData.Core.Application
     /// </summary>
     public static class DIExtensions
     {
-        /// <summary>
-        /// Adds a basic CRUD service for a specific DTO and entity type to the service collection.
-        /// </summary>
-        /// <typeparam name="TDto">The DTO type the service operates on.</typeparam>
-        /// <typeparam name="TEntity">The entity type corresponding to the DTO.</typeparam>
-        /// <typeparam name="TId">The type of the entity's identifier.</typeparam>
-        /// <typeparam name="TProfile">The AutoMapper profile type for configuring mappings between the DTO and the entity.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
-        /// <param name="configureService">An optional action to configure additional services for the CRUD service.</param>
-        /// <returns>The original <see cref="IServiceCollection"/> instance, allowing further configuration.</returns>
-        public static IServiceCollection AddCleanBasicCRUDService<TCRUDRepository, TDto, TEntity, TId, TProfile>(this IServiceCollection services, Action<IServiceCollection>? configureService = null)
-            where TCRUDRepository : ICRUDRepository<TEntity, TId> where TDto : class, IUnique<TId> where TEntity : class, IUnique<TId> where TProfile : Profile
-        {
-            services.AddScoped<IBasicCRUDService<TDto, TEntity, TId>, BasicCRUDService<TCRUDRepository, TDto, TEntity, TId>>();
-            configureService?.Invoke(services);
-
-            services.AddAutoMapper(typeof(TProfile).Assembly);
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds a CRUD service for managing create, read, update, and delete operations for a specific set of DTOs and an entity type to the service collection.
-        /// </summary>
-        /// <typeparam name="TCRUDRepository">The repository type that provides CRUD operations for entities of type TEntity.</typeparam>
-        /// <typeparam name="TCreateDto">The DTO type used for create operations.</typeparam>
-        /// <typeparam name="TReadDto">The DTO type used for read operations.</typeparam>
-        /// <typeparam name="TEntity">The entity type corresponding to the DTOs.</typeparam>
-        /// <typeparam name="TId">The type of the entity's identifier.</typeparam>
-        /// <typeparam name="TProfile">The AutoMapper profile type for configuring mappings between the DTOs and the entity.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
-        /// <param name="configureService">An optional action to configure additional services for the CRUD service.</param>
-        /// <returns>The original <see cref="IServiceCollection"/> instance, allowing further configuration.</returns>
-        public static IServiceCollection AddCleanCRUDService<TCRUDRepository, TCreateDto, TReadDto, TUpdateDto, TEntity, TId, TProfile>(this IServiceCollection services, Action<IServiceCollection>? configureService = null)
-            where TCRUDRepository : ICRUDRepository<TEntity, TId> where TCreateDto : class where TReadDto : class, IUnique<TId> where TEntity : class, IUnique<TId> where TProfile : Profile
-        {
-            services.AddScoped<ICRUDService<TCreateDto, TReadDto, TEntity, TId>, CRUDService<TCRUDRepository, TCreateDto, TReadDto, TEntity, TId>>();
-            configureService?.Invoke(services);
-
-            services.AddAutoMapper(typeof(TProfile).Assembly);
-
-            return services;
-        }
-
         /// <summary>
         /// Adds the directory search service to the <see cref="IServiceCollection"/>.
         /// </summary>
@@ -71,12 +25,9 @@ namespace DigitalData.Core.Application
         /// If <paramref name="directorySearchOptions"/> is not provided, ensure to configure the options separately
         /// using the <see cref="IOptions{TOptions}"/> pattern.
         /// </remarks>
-        public static IServiceCollection AddDirectorySearchService(this IServiceCollection service, DirectorySearchOptions? directorySearchOptions = null)
+        public static IServiceCollection AddDirectorySearchService(this IServiceCollection service, IConfigurationSection directorySearchOptions)
         {
-            if(directorySearchOptions is not null)
-                service.AddSingleton(Options.Create(directorySearchOptions));
-
-            return service
+            return service.Configure<DirectorySearchOptions>(directorySearchOptions)
                 .AddMemoryCache()
                 .AddScoped<IDirectorySearchService, DirectorySearchService>();
         }
diff --git a/DigitalData.Core.Application/DigitalData.Core.Application.csproj b/DigitalData.Core.Application/DigitalData.Core.Application.csproj
index 9391841..ef70af7 100644
--- a/DigitalData.Core.Application/DigitalData.Core.Application.csproj
+++ b/DigitalData.Core.Application/DigitalData.Core.Application.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
     <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />