diff --git a/DigitalData.Core.Abstraction.Application/DTO/DIExtensions.cs b/DigitalData.Core.Abstraction.Application/DTO/DIExtensions.cs
index d04d8fe..89eba58 100644
--- a/DigitalData.Core.Abstraction.Application/DTO/DIExtensions.cs
+++ b/DigitalData.Core.Abstraction.Application/DTO/DIExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Configuration;
+#if NET
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System.Configuration;
 
@@ -31,4 +32,5 @@ public static class DIExtensions
         });
         return services;
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/DTO/DTOExtensions.cs b/DigitalData.Core.Abstraction.Application/DTO/DTOExtensions.cs
index 39271be..971d5cc 100644
--- a/DigitalData.Core.Abstraction.Application/DTO/DTOExtensions.cs
+++ b/DigitalData.Core.Abstraction.Application/DTO/DTOExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+#if NET
+using Microsoft.Extensions.Logging;
 using System.Text;
 
 namespace DigitalData.Core.Abstraction.Application.DTO;
@@ -19,7 +20,7 @@ public static class DTOExtensions
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public static T Message<T>(this T result, string? message) where T : Result
     {
-        if(message is not null)
+        if (message is not null)
             result.Messages.Add(message);
         return result;
     }
@@ -28,7 +29,7 @@ public static class DTOExtensions
     internal static IEnumerable<T> FilterNull<T>(this IEnumerable<T?> list)
     {
         foreach (var item in list)
-            if(item is not null)
+            if (item is not null)
                 yield return item;
     }
 
@@ -328,7 +329,7 @@ public static class DTOExtensions
     /// <param name="end">The ending string.</param>
     /// <returns>The joined string.</returns>
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
-    public static string Join<T>(this IEnumerable<T> values, string start = "", string seperator = ". ", string end = ".") 
+    public static string Join<T>(this IEnumerable<T> values, string start = "", string seperator = ". ", string end = ".")
         => new StringBuilder(start).Append(string.Join(seperator, values)).Append(end).ToString();
 
     /// <summary>
@@ -342,7 +343,7 @@ public static class DTOExtensions
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public static void LogNotice(this ILogger logger, IEnumerable<Notice> notices, string start = ": ", string seperator = ". ", string end = ".\n")
     {
-        foreach(LogLevel level in Enum.GetValues(typeof(LogLevel)))
+        foreach (LogLevel level in Enum.GetValues(typeof(LogLevel)))
         {
             var logNotices = notices.Where(n => n.Level == level);
 
@@ -350,7 +351,7 @@ public static class DTOExtensions
                 continue;
 
             var sb = new StringBuilder();
-            foreach(Notice notice in logNotices)
+            foreach (Notice notice in logNotices)
             {
                 if (notice.Flag is not null)
                     sb.Append(notice.Flag);
@@ -390,4 +391,5 @@ public static class DTOExtensions
     /// <returns>True if the data result is false; otherwise, false.</returns>
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public static bool IsWrong(this DataResult<bool> bResult) => !bResult.Data;
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/DTO/Flag.cs b/DigitalData.Core.Abstraction.Application/DTO/Flag.cs
index 6010183..611a1b2 100644
--- a/DigitalData.Core.Abstraction.Application/DTO/Flag.cs
+++ b/DigitalData.Core.Abstraction.Application/DTO/Flag.cs
@@ -1,4 +1,5 @@
-namespace DigitalData.Core.Abstraction.Application.DTO;
+#if NET
+namespace DigitalData.Core.Abstraction.Application.DTO;
 
 /// <summary>
 /// Defines flags that indicate specific types of status or conditions in a service operation.
@@ -47,4 +48,5 @@ public enum Flag
     /// This flag is used when the specified item or condition does not exist or is unavailable.
     /// </summary>
     NotFound
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/DTO/Notice.cs b/DigitalData.Core.Abstraction.Application/DTO/Notice.cs
index 326ee85..fc3f379 100644
--- a/DigitalData.Core.Abstraction.Application/DTO/Notice.cs
+++ b/DigitalData.Core.Abstraction.Application/DTO/Notice.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+#if NET
+using Microsoft.Extensions.Logging;
 
 namespace DigitalData.Core.Abstraction.Application.DTO;
 
@@ -25,4 +26,5 @@ public class Notice
     /// </summary>
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public List<string> Messages { get; init; } = new();
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/DTO/Result.cs b/DigitalData.Core.Abstraction.Application/DTO/Result.cs
index 2c36047..7313bce 100644
--- a/DigitalData.Core.Abstraction.Application/DTO/Result.cs
+++ b/DigitalData.Core.Abstraction.Application/DTO/Result.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#if NET
+using System.Text.Json.Serialization;
 
 namespace DigitalData.Core.Abstraction.Application.DTO;
 
@@ -105,4 +106,5 @@ public class Result
         Data = default
     };
 #pragma warning restore CS8601 // Possible null reference assignment.
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/EntityExtensions.cs b/DigitalData.Core.Abstraction.Application/EntityExtensions.cs
index d1d0677..ba5fbe5 100644
--- a/DigitalData.Core.Abstraction.Application/EntityExtensions.cs
+++ b/DigitalData.Core.Abstraction.Application/EntityExtensions.cs
@@ -1,4 +1,5 @@
-namespace DigitalData.Core.Abstraction.Application;
+#if NET
+namespace DigitalData.Core.Abstraction.Application;
 
 /// <summary>
 /// Provides extension methods for retrieving the value of an 'Id' property from objects.
@@ -91,4 +92,5 @@ public static class EntityExtensions
 #pragma warning restore CS8601
         return id is not null;
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/IBasicCRUDService.cs b/DigitalData.Core.Abstraction.Application/IBasicCRUDService.cs
index 290b9ce..c2b91bb 100644
--- a/DigitalData.Core.Abstraction.Application/IBasicCRUDService.cs
+++ b/DigitalData.Core.Abstraction.Application/IBasicCRUDService.cs
@@ -1,4 +1,5 @@
-namespace DigitalData.Core.Abstraction.Application
+#if NET
+namespace DigitalData.Core.Abstraction.Application
 {
     /// <summary>
     /// Implements a simplified CRUD service interface that uses a single Data Transfer Object (DTO) type for all CRUD operations,
@@ -18,4 +19,5 @@
         where TDto : class where TEntity : class
     {
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/ICRUDService.cs b/DigitalData.Core.Abstraction.Application/ICRUDService.cs
index 6b53fe8..12bc3a6 100644
--- a/DigitalData.Core.Abstraction.Application/ICRUDService.cs
+++ b/DigitalData.Core.Abstraction.Application/ICRUDService.cs
@@ -1,25 +1,26 @@
-using DigitalData.Core.Abstraction.Application.DTO;
+#if NET
+using DigitalData.Core.Abstraction.Application.DTO;
 
-namespace DigitalData.Core.Abstraction.Application
+namespace DigitalData.Core.Abstraction.Application;
+
+[Obsolete("Use MediatR")]
+public interface ICRUDService<TCreateDto, TReadDto, TEntity, TId> : IReadService<TReadDto, TEntity, TId>
+    where TCreateDto : class where TReadDto : class where TEntity : class
 {
-    [Obsolete("Use MediatR")]
-    public interface ICRUDService<TCreateDto, TReadDto, TEntity, TId> : IReadService<TReadDto, TEntity, TId>
-        where TCreateDto : class where TReadDto : class where TEntity : class
-    {
-        /// <summary>
-        /// Asynchronously creates a new entity based on the provided <paramref name="createDto"/> and returns the identifier of the created entity wrapped in a <see cref="DataResult{TId}"/>.
-        /// The <see cref="DataResult{TId}"/> contains the identifier of the newly created entity on success or an error message on failure.
-        /// </summary>
-        /// <param name="createDto">The data transfer object containing the information for the new entity.</param>
-        /// <returns>A task representing the asynchronous operation, with a <see cref="DataResult{TId}"/> containing the identifier of the created entity or an error message.</returns>
-        Task<DataResult<TReadDto>> CreateAsync(TCreateDto createDto);
+    /// <summary>
+    /// Asynchronously creates a new entity based on the provided <paramref name="createDto"/> and returns the identifier of the created entity wrapped in a <see cref="DataResult{TId}"/>.
+    /// The <see cref="DataResult{TId}"/> contains the identifier of the newly created entity on success or an error message on failure.
+    /// </summary>
+    /// <param name="createDto">The data transfer object containing the information for the new entity.</param>
+    /// <returns>A task representing the asynchronous operation, with a <see cref="DataResult{TId}"/> containing the identifier of the created entity or an error message.</returns>
+    Task<DataResult<TReadDto>> CreateAsync(TCreateDto createDto);
 
-        /// <summary>
-        /// Updates an existing entity based on the provided updateDTO and returns the result wrapped in an IServiceMessage,
-        /// indicating the success or failure of the operation, including the error messages on failure.
-        /// </summary>
-        /// <param name="updateDto">The updateDTO with updated values for the entity.</param>
-        /// <returns>An Result indicating the outcome of the update operation, with an appropriate message.</returns>
-        Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Updates an existing entity based on the provided updateDTO and returns the result wrapped in an IServiceMessage,
+    /// indicating the success or failure of the operation, including the error messages on failure.
+    /// </summary>
+    /// <param name="updateDto">The updateDTO with updated values for the entity.</param>
+    /// <returns>An Result indicating the outcome of the update operation, with an appropriate message.</returns>
+    Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto);
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/IDirectorySearchService.cs b/DigitalData.Core.Abstraction.Application/IDirectorySearchService.cs
index 5ae1504..5d00c43 100644
--- a/DigitalData.Core.Abstraction.Application/IDirectorySearchService.cs
+++ b/DigitalData.Core.Abstraction.Application/IDirectorySearchService.cs
@@ -1,94 +1,96 @@
-using DigitalData.Core.Abstraction.Application.DTO;
+#if NET
+using DigitalData.Core.Abstraction.Application.DTO;
 using System.DirectoryServices;
 
-namespace DigitalData.Core.Abstraction.Application
+namespace DigitalData.Core.Abstraction.Application;
+
+[Obsolete("Use DigitalData.ActiveDirectory")]
+public interface IDirectorySearchService
 {
-    public interface IDirectorySearchService
-    {
-        public string ServerName { get; }
+    public string ServerName { get; }
 
-        public string Root { get; }
+    public string Root { get; }
 
-        string SearchRootPath { get; }
+    string SearchRootPath { get; }
 
-        Dictionary<string, string> CustomSearchFilters { get; }
+    Dictionary<string, string> CustomSearchFilters { get; }
 
-        /// <summary>
-        /// Creates the connections to the server and returns a Boolean value that specifies
-        /// whether the specified username and password are valid.
-        /// </summary>
-        /// <param name="userName">The username that is validated on the server. See the Remarks section
-        /// for more information on the format of userName.</param>
-        /// <param name="password">The password that is validated on the server.</param>
-        /// <returns>True if the credentials are valid; otherwise, false.</returns>
-        bool ValidateCredentials(string userName, string password);
+    /// <summary>
+    /// Creates the connections to the server and returns a Boolean value that specifies
+    /// whether the specified username and password are valid.
+    /// </summary>
+    /// <param name="userName">The username that is validated on the server. See the Remarks section
+    /// for more information on the format of userName.</param>
+    /// <param name="password">The password that is validated on the server.</param>
+    /// <returns>True if the credentials are valid; otherwise, false.</returns>
+    bool ValidateCredentials(string userName, string password);
 
-        /// <summary>
-        /// Creates the connections to the server asynchronously and returns a Boolean value that specifies
-        /// whether the specified username and password are valid.
-        /// </summary>
-        /// <param name="userName">The username that is validated on the server. See the Remarks section
-        /// for more information on the format of userName.</param>
-        /// <param name="password">The password that is validated on the server.</param>
-        /// <returns>True if the credentials are valid; otherwise, false.</returns>
-        Task<bool> ValidateCredentialsAsync(string userName, string password);
+    /// <summary>
+    /// Creates the connections to the server asynchronously and returns a Boolean value that specifies
+    /// whether the specified username and password are valid.
+    /// </summary>
+    /// <param name="userName">The username that is validated on the server. See the Remarks section
+    /// for more information on the format of userName.</param>
+    /// <param name="password">The password that is validated on the server.</param>
+    /// <returns>True if the credentials are valid; otherwise, false.</returns>
+    Task<bool> ValidateCredentialsAsync(string userName, string password);
 
-        /// <summary>
-        /// Finds all directory entries matching the specified filter.
-        /// </summary>
-        /// <param name="searchRoot">The search root.</param>
-        /// <param name="filter">The search filter.</param>
-        /// <param name="searchScope">The search scope.</param>
-        /// <param name="sizeLimit">The size limit.</param>
-        /// <param name="properties">The properties to load.</param>
-        /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
-        DataResult<IEnumerable<ResultPropertyCollection>> FindAll(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
+    /// <summary>
+    /// Finds all directory entries matching the specified filter.
+    /// </summary>
+    /// <param name="searchRoot">The search root.</param>
+    /// <param name="filter">The search filter.</param>
+    /// <param name="searchScope">The search scope.</param>
+    /// <param name="sizeLimit">The size limit.</param>
+    /// <param name="properties">The properties to load.</param>
+    /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
+    DataResult<IEnumerable<ResultPropertyCollection>> FindAll(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
 
-        /// <summary>
-        /// Finds all directory entries matching the specified filter asynchronously.
-        /// </summary>
-        /// <param name="searchRoot">The search root.</param>
-        /// <param name="filter">The search filter.</param>
-        /// <param name="searchScope">The search scope.</param>
-        /// <param name="sizeLimit">The size limit.</param>
-        /// <param name="properties">The properties to load.</param>
-        /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
-        Task<DataResult<IEnumerable<ResultPropertyCollection>>> FindAllAsync(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
+    /// <summary>
+    /// Finds all directory entries matching the specified filter asynchronously.
+    /// </summary>
+    /// <param name="searchRoot">The search root.</param>
+    /// <param name="filter">The search filter.</param>
+    /// <param name="searchScope">The search scope.</param>
+    /// <param name="sizeLimit">The size limit.</param>
+    /// <param name="properties">The properties to load.</param>
+    /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
+    Task<DataResult<IEnumerable<ResultPropertyCollection>>> FindAllAsync(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
 
-        /// <summary>
-        /// Finds all directory entries matching the specified filter, using the user cache.
-        /// </summary>
-        /// <param name="username">The username.</param>
-        /// <param name="filter">The search filter.</param>
-        /// <param name="searchScope">The search scope.</param>
-        /// <param name="sizeLimit">The size limit.</param>
-        /// <param name="properties">The properties to load.</param>
-        /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
-        DataResult<IEnumerable<ResultPropertyCollection>> FindAllByUserCache(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
+    /// <summary>
+    /// Finds all directory entries matching the specified filter, using the user cache.
+    /// </summary>
+    /// <param name="username">The username.</param>
+    /// <param name="filter">The search filter.</param>
+    /// <param name="searchScope">The search scope.</param>
+    /// <param name="sizeLimit">The size limit.</param>
+    /// <param name="properties">The properties to load.</param>
+    /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
+    DataResult<IEnumerable<ResultPropertyCollection>> FindAllByUserCache(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
 
-        /// <summary>
-        /// Finds all directory entries matching the specified filter asynchronously, using the user cache.
-        /// </summary>
-        /// <param name="username">The username.</param>
-        /// <param name="filter">The search filter.</param>
-        /// <param name="searchScope">The search scope.</param>
-        /// <param name="sizeLimit">The size limit.</param>
-        /// <param name="properties">The properties to load.</param>
-        /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
-        Task<DataResult<IEnumerable<ResultPropertyCollection>>> FindAllByUserCacheAsync(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
+    /// <summary>
+    /// Finds all directory entries matching the specified filter asynchronously, using the user cache.
+    /// </summary>
+    /// <param name="username">The username.</param>
+    /// <param name="filter">The search filter.</param>
+    /// <param name="searchScope">The search scope.</param>
+    /// <param name="sizeLimit">The size limit.</param>
+    /// <param name="properties">The properties to load.</param>
+    /// <returns>A <see cref="DataResult{T}"/> containing the results.</returns>
+    Task<DataResult<IEnumerable<ResultPropertyCollection>>> FindAllByUserCacheAsync(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties);
 
-        /// <summary>
-        /// Sets the search root in the cache.
-        /// </summary>
-        /// <param name="username">The directory entry username.</param>
-        /// <param name="password">The directory entry password.</param>
-        void SetSearchRootCache(string username, string password);
+    /// <summary>
+    /// Sets the search root in the cache.
+    /// </summary>
+    /// <param name="username">The directory entry username.</param>
+    /// <param name="password">The directory entry password.</param>
+    void SetSearchRootCache(string username, string password);
 
-        /// <summary>
-        /// Gets the search root from the cache.
-        /// </summary>
-        /// <param name="username">The directory entry username.</param>
-        /// <returns>The cached <see cref="DirectoryEntry"/> if found; otherwise, null.</returns>
-        DirectoryEntry? GetSearchRootCache(string username);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets the search root from the cache.
+    /// </summary>
+    /// <param name="username">The directory entry username.</param>
+    /// <returns>The cached <see cref="DirectoryEntry"/> if found; otherwise, null.</returns>
+    DirectoryEntry? GetSearchRootCache(string username);
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/IJWTService.cs b/DigitalData.Core.Abstraction.Application/IJWTService.cs
index b5008e6..8ecc32e 100644
--- a/DigitalData.Core.Abstraction.Application/IJWTService.cs
+++ b/DigitalData.Core.Abstraction.Application/IJWTService.cs
@@ -1,41 +1,42 @@
-using Microsoft.IdentityModel.Tokens;
+#if NET
+using Microsoft.IdentityModel.Tokens;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Cryptography;
 
-namespace DigitalData.Core.Abstraction.Application
+namespace DigitalData.Core.Abstraction.Application;
+
+/// <summary>
+/// Defines the operations for JWT service handling claims of type <typeparamref name="TClaimValue"/>.
+/// </summary>
+public interface IJWTService<TClaimValue>
 {
     /// <summary>
-    /// Defines the operations for JWT service handling claims of type <typeparamref name="TClaimValue"/>.
+    /// Generates a symmetric security key with the specified byte size.
     /// </summary>
-    public interface IJWTService<TClaimValue>
+    /// <param name="byteSize">The size of the security key in bytes. Default is 32 bytes.</param>
+    /// <returns>A new instance of <see cref="SymmetricSecurityKey"/>.</returns>
+    public static SymmetricSecurityKey GenerateSecurityKey(int byteSize = 32)
     {
-        /// <summary>
-        /// Generates a symmetric security key with the specified byte size.
-        /// </summary>
-        /// <param name="byteSize">The size of the security key in bytes. Default is 32 bytes.</param>
-        /// <returns>A new instance of <see cref="SymmetricSecurityKey"/>.</returns>
-        public static SymmetricSecurityKey GenerateSecurityKey(int byteSize = 32)
-        {
-            using var rng = RandomNumberGenerator.Create();
-            var randomBytes = new byte[byteSize];
-            rng.GetBytes(randomBytes);
-            var securityKey = new SymmetricSecurityKey(randomBytes);
+        using var rng = RandomNumberGenerator.Create();
+        var randomBytes = new byte[byteSize];
+        rng.GetBytes(randomBytes);
+        var securityKey = new SymmetricSecurityKey(randomBytes);
 
-            return securityKey;
-        }
-
-        /// <summary>
-        /// Generates a token based on the specified claim value.
-        /// </summary>
-        /// <param name="claimValue">The claim value to encode in the token.</param>
-        /// <returns>A JWT as a string.</returns>
-        string GenerateToken(TClaimValue claimValue);
-
-        /// <summary>
-        /// Reads and validates a security token from a string representation.
-        /// </summary>
-        /// <param name="token">The JWT to read.</param>
-        /// <returns>A <see cref="JwtSecurityToken"/> if the token is valid; otherwise, null.</returns>
-        JwtSecurityToken? ReadSecurityToken(string token);
+        return securityKey;
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Generates a token based on the specified claim value.
+    /// </summary>
+    /// <param name="claimValue">The claim value to encode in the token.</param>
+    /// <returns>A JWT as a string.</returns>
+    string GenerateToken(TClaimValue claimValue);
+
+    /// <summary>
+    /// Reads and validates a security token from a string representation.
+    /// </summary>
+    /// <param name="token">The JWT to read.</param>
+    /// <returns>A <see cref="JwtSecurityToken"/> if the token is valid; otherwise, null.</returns>
+    JwtSecurityToken? ReadSecurityToken(string token);
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/IReadService.cs b/DigitalData.Core.Abstraction.Application/IReadService.cs
index ccc7ccd..4392299 100644
--- a/DigitalData.Core.Abstraction.Application/IReadService.cs
+++ b/DigitalData.Core.Abstraction.Application/IReadService.cs
@@ -1,39 +1,40 @@
-using DigitalData.Core.Abstraction.Application.DTO;
+#if NET
+using DigitalData.Core.Abstraction.Application.DTO;
 
-namespace DigitalData.Core.Abstraction.Application
+namespace DigitalData.Core.Abstraction.Application;
+
+[Obsolete("Use MediatR")]
+public interface IReadService<TReadDto, TEntity, TId>
+    where TReadDto : class where TEntity : class
 {
-    [Obsolete("Use MediatR")]
-    public interface IReadService<TReadDto, TEntity, TId>
-        where TReadDto : class where TEntity : class
-    {
-        /// <summary>
-        /// Retrieves an entity by its identifier and returns its readDTO representation wrapped in an IServiceResult,
-        /// including the readDTO on success or null and an error message on failure.
-        /// </summary>
-        /// <param name="id">The identifier of the entity to retrieve.</param>
-        /// <returns>An DataResult containing the readDTO representing the found entity or null, with an appropriate message.</returns>
-        Task<DataResult<TReadDto>> ReadByIdAsync(TId id);
+    /// <summary>
+    /// Retrieves an entity by its identifier and returns its readDTO representation wrapped in an IServiceResult,
+    /// including the readDTO on success or null and an error message on failure.
+    /// </summary>
+    /// <param name="id">The identifier of the entity to retrieve.</param>
+    /// <returns>An DataResult containing the readDTO representing the found entity or null, with an appropriate message.</returns>
+    Task<DataResult<TReadDto>> ReadByIdAsync(TId id);
 
-        /// <summary>
-        /// Retrieves all entities and returns their readDTO representations wrapped in an IServiceResult,
-        /// including a collection of readDTOs on success or an error message on failure.
-        /// </summary>
-        /// <returns>An DataResult containing a collection of readDTOs representing all entities or an error message.</returns>
-        Task<DataResult<IEnumerable<TReadDto>>> ReadAllAsync();
-        
-        /// <summary>
-        /// Deletes an entity by its identifier and returns the result wrapped in an IServiceMessage,
-        /// indicating the success or failure of the operation, including the error messages on failure.
-        /// </summary>
-        /// <param name="id">The identifier of the entity to delete.</param>
-        /// <returns>An Result indicating the outcome of the delete operation, with an appropriate message.</returns>
-        Task<Result> DeleteAsyncById(TId id);
+    /// <summary>
+    /// Retrieves all entities and returns their readDTO representations wrapped in an IServiceResult,
+    /// including a collection of readDTOs on success or an error message on failure.
+    /// </summary>
+    /// <returns>An DataResult containing a collection of readDTOs representing all entities or an error message.</returns>
+    Task<DataResult<IEnumerable<TReadDto>>> ReadAllAsync();
 
-        /// <summary>
-        /// Asynchronously checks if an entity with the specified identifier exists within the data store.
-        /// </summary>
-        /// <param name="id">The identifier of the entity to check.</param>
-        /// <returns>A task that represents the asynchronous operation. The task result contains a boolean value indicating whether the entity exists.</returns>
-        Task<bool> HasEntity(TId id);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Deletes an entity by its identifier and returns the result wrapped in an IServiceMessage,
+    /// indicating the success or failure of the operation, including the error messages on failure.
+    /// </summary>
+    /// <param name="id">The identifier of the entity to delete.</param>
+    /// <returns>An Result indicating the outcome of the delete operation, with an appropriate message.</returns>
+    Task<Result> DeleteAsyncById(TId id);
+
+    /// <summary>
+    /// Asynchronously checks if an entity with the specified identifier exists within the data store.
+    /// </summary>
+    /// <param name="id">The identifier of the entity to check.</param>
+    /// <returns>A task that represents the asynchronous operation. The task result contains a boolean value indicating whether the entity exists.</returns>
+    Task<bool> HasEntity(TId id);
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/Repository/ICRUDRepository.cs b/DigitalData.Core.Abstraction.Application/Repository/ICRUDRepository.cs
index 281169e..8e874cb 100644
--- a/DigitalData.Core.Abstraction.Application/Repository/ICRUDRepository.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/ICRUDRepository.cs
@@ -1,4 +1,5 @@
-namespace DigitalData.Core.Abstraction.Application.Repository
+#if NET
+namespace DigitalData.Core.Abstraction.Application.Repository
 {
     /// <summary>
     /// Defines the contract for CRUD operations on a repository for entities of type TEntity.
@@ -60,4 +61,5 @@
         /// </remarks>
         Task<int> CountAsync(TId id);
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/Repository/IEntityMapper.cs b/DigitalData.Core.Abstraction.Application/Repository/IEntityMapper.cs
index fd3bd5b..b5509ce 100644
--- a/DigitalData.Core.Abstraction.Application/Repository/IEntityMapper.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/IEntityMapper.cs
@@ -1,4 +1,7 @@
-namespace DigitalData.Core.Abstraction.Application.Repository
+#if NETFRAMEWORK
+using System.Collections.Generic;
+#endif
+namespace DigitalData.Core.Abstraction.Application.Repository
 {
     /// <summary>
     /// Defines methods for mapping between entities and Data Transfer Objects (DTOs).