diff --git a/src/ExtCore.Data.Abstractions/ExtCore.Data.Abstractions.csproj b/src/ExtCore.Data.Abstractions/ExtCore.Data.Abstractions.csproj
index 022d63f..61eff78 100644
--- a/src/ExtCore.Data.Abstractions/ExtCore.Data.Abstractions.csproj
+++ b/src/ExtCore.Data.Abstractions/ExtCore.Data.Abstractions.csproj
@@ -1,15 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Authors>Dmitry Sikorsky</Authors>
-    <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
-    <Description>The ExtCore.Data extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>6.0.0</VersionPrefix>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>ExtCore.Data.Abstractions</AssemblyName>
-    <PackageId>ExtCore.Data.Abstractions</PackageId>
-    <PackageIconUrl>http://extcore.net/extcore_nuget_icon.png</PackageIconUrl>
-    <PackageProjectUrl>http://extcore.net/</PackageProjectUrl>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\BenriyaCore\Benriya.Share\Benriya.Share.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ExtCore.Data.Abstractions/IRepository.cs b/src/ExtCore.Data.Abstractions/IRepository.cs
index aa65ad8..6171510 100644
--- a/src/ExtCore.Data.Abstractions/IRepository.cs
+++ b/src/ExtCore.Data.Abstractions/IRepository.cs
@@ -1,6 +1,9 @@
 // Copyright © 2015 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Benriya.Share.Abstractions;
+using MapsterMapper;
+
 namespace ExtCore.Data.Abstractions
 {
   /// <summary>
@@ -12,6 +15,6 @@ public interface IRepository
     /// Sets the storage context to work with.
     /// </summary>
     /// <param name="storageContext">The storage context to set.</param>
-    void SetStorageContext(IStorageContext storageContext);
+    void SetStorageContext(IStorageContext storageContext,IRequestServices client);
   }
 }
\ No newline at end of file
diff --git a/src/ExtCore.Data.Abstractions/IStorage.cs b/src/ExtCore.Data.Abstractions/IStorage.cs
index a5bd713..b398ec8 100644
--- a/src/ExtCore.Data.Abstractions/IStorage.cs
+++ b/src/ExtCore.Data.Abstractions/IStorage.cs
@@ -1,6 +1,7 @@
 // Copyright © 2015 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Benriya.Share.Abstractions;
 using System.Threading.Tasks;
 
 namespace ExtCore.Data.Abstractions
@@ -12,11 +13,11 @@ namespace ExtCore.Data.Abstractions
   /// </summary>
   public interface IStorage
   {
+    IRequestServices Client { get; }
     /// <summary>
     /// Gets the underlying storage context used by this storage.
     /// </summary>
     IStorageContext StorageContext { get; }
-
     /// <summary>
     /// Gets a repository of the given type.
     /// </summary>
diff --git a/src/ExtCore.Data.Dapper/ExtCore.Data.Dapper.csproj b/src/ExtCore.Data.Dapper/ExtCore.Data.Dapper.csproj
index 7455c47..867a921 100644
--- a/src/ExtCore.Data.Dapper/ExtCore.Data.Dapper.csproj
+++ b/src/ExtCore.Data.Dapper/ExtCore.Data.Dapper.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\BenriyaCore\Benriya.Share\Benriya.Share.csproj" />
     <ProjectReference Include="..\ExtCore.Data.Abstractions\ExtCore.Data.Abstractions.csproj" />
     <ProjectReference Include="..\ExtCore.Data.Entities.Abstractions\ExtCore.Data.Entities.Abstractions.csproj" />
     <ProjectReference Include="..\ExtCore.Infrastructure\ExtCore.Infrastructure.csproj" />
diff --git a/src/ExtCore.Data.Dapper/RepositoryBase.cs b/src/ExtCore.Data.Dapper/RepositoryBase.cs
index ff57599..5b6c21a 100644
--- a/src/ExtCore.Data.Dapper/RepositoryBase.cs
+++ b/src/ExtCore.Data.Dapper/RepositoryBase.cs
@@ -1,6 +1,7 @@
 // Copyright © 2017 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Benriya.Share.Abstractions;
 using ExtCore.Data.Abstractions;
 using ExtCore.Data.Entities.Abstractions;
 
@@ -14,15 +15,17 @@ public abstract class RepositoryBase<TEntity> : IRepository where TEntity : clas
   {
     protected IStorageContext storageContext;
     protected string connectionString;
+    protected IRequestServices Client;
 
     /// <summary>
     /// Sets the Dapper storage context that represents the physical storage to work with.
     /// </summary>
     /// <param name="storageContext">The Dapper storage context to set.</param>
-    public void SetStorageContext(IStorageContext storageContext)
+    public void SetStorageContext(IStorageContext storageContext,IRequestServices client)
     {
       this.storageContext = storageContext;
       this.connectionString = (storageContext as StorageContextBase).ConnectionString;
-    }
+        this.Client = client;
+}
   }
 }
\ No newline at end of file
diff --git a/src/ExtCore.Data.Dapper/Storage.cs b/src/ExtCore.Data.Dapper/Storage.cs
index 37fbab3..94e241e 100644
--- a/src/ExtCore.Data.Dapper/Storage.cs
+++ b/src/ExtCore.Data.Dapper/Storage.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Benriya.Share.Abstractions;
 using ExtCore.Data.Abstractions;
 using ExtCore.Infrastructure;
 
@@ -14,27 +15,29 @@ namespace ExtCore.Data.Dapper
   /// </summary>
   public class Storage : IStorage
   {
+    public IRequestServices Client { get; private set; }
     /// <summary>
     /// Gets the Dapper storage context.
     /// </summary>
     public IStorageContext StorageContext { get; private set; }
 
-    public Storage(IStorageContext storageContext)
-    {
-      this.StorageContext = storageContext;
-    }
-
-    /// <summary>
-    /// Gets a repository of the given type.
-    /// </summary>
-    /// <typeparam name="T">The type parameter to find implementation of.</typeparam>
-    /// <returns></returns>
-    public TRepository GetRepository<TRepository>() where TRepository : IRepository
+        public Storage(IStorageContext storageContext, IRequestServices client)
+        {
+            this.StorageContext = storageContext;
+            this.Client = client;
+        }
+
+        /// <summary>
+        /// Gets a repository of the given type.
+        /// </summary>
+        /// <typeparam name="T">The type parameter to find implementation of.</typeparam>
+        /// <returns></returns>
+        public TRepository GetRepository<TRepository>() where TRepository : IRepository
     {
       TRepository repository = ExtensionManager.GetInstance<TRepository>();
 
       if (repository != null)
-        repository.SetStorageContext(this.StorageContext);
+        repository.SetStorageContext(this.StorageContext,this.Client);
 
       return repository;
     }
@@ -51,6 +54,7 @@ public void Save()
     /// </summary>
     public async Task SaveAsync()
     {
+        await Task.Run(() => { return; });
     }
   }
 }
\ No newline at end of file
diff --git a/src/ExtCore.Data.EntityFramework/ExtCore.Data.EntityFramework.csproj b/src/ExtCore.Data.EntityFramework/ExtCore.Data.EntityFramework.csproj
index 0a90351..16a95c5 100644
--- a/src/ExtCore.Data.EntityFramework/ExtCore.Data.EntityFramework.csproj
+++ b/src/ExtCore.Data.EntityFramework/ExtCore.Data.EntityFramework.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\BenriyaCore\Benriya.Share\Benriya.Share.csproj" />
     <ProjectReference Include="..\ExtCore.Data.Abstractions\ExtCore.Data.Abstractions.csproj" />
     <ProjectReference Include="..\ExtCore.Data.Entities.Abstractions\ExtCore.Data.Entities.Abstractions.csproj" />
     <ProjectReference Include="..\ExtCore.Infrastructure\ExtCore.Infrastructure.csproj" />
diff --git a/src/ExtCore.Data.EntityFramework/RepositoryBase.cs b/src/ExtCore.Data.EntityFramework/RepositoryBase.cs
index 1a022c1..daf9cd2 100644
--- a/src/ExtCore.Data.EntityFramework/RepositoryBase.cs
+++ b/src/ExtCore.Data.EntityFramework/RepositoryBase.cs
@@ -1,6 +1,7 @@
 // Copyright © 2017 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Benriya.Share.Abstractions;
 using ExtCore.Data.Abstractions;
 using ExtCore.Data.Entities.Abstractions;
 using Microsoft.EntityFrameworkCore;
@@ -15,15 +16,17 @@ public abstract class RepositoryBase<TEntity> : IRepository where TEntity : clas
   {
     protected DbContext storageContext;
     protected DbSet<TEntity> dbSet;
+    protected IRequestServices Client;
 
     /// <summary>
     /// Sets the Entity Framework storage context that represents the physical storage to work with.
     /// </summary>
     /// <param name="storageContext">The Entity Framework storage context to set.</param>
-    public void SetStorageContext(IStorageContext storageContext)
+    public void SetStorageContext(IStorageContext storageContext,IRequestServices client)
     {
       this.storageContext = storageContext as DbContext;
       this.dbSet = this.storageContext.Set<TEntity>();
+    this.Client = client;
     }
   }
 }
\ No newline at end of file
diff --git a/src/ExtCore.Data.EntityFramework/Storage.cs b/src/ExtCore.Data.EntityFramework/Storage.cs
index eedae26..51a60b0 100644
--- a/src/ExtCore.Data.EntityFramework/Storage.cs
+++ b/src/ExtCore.Data.EntityFramework/Storage.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Benriya.Share.Abstractions;
 using ExtCore.Data.Abstractions;
 using ExtCore.Infrastructure;
 using Microsoft.EntityFrameworkCore;
@@ -16,17 +17,19 @@ namespace ExtCore.Data.EntityFramework
   /// </summary>
   public class Storage : IStorage
   {
-    /// <summary>
-    /// Gets the Entity Framework storage context.
-    /// </summary>
-    public IStorageContext StorageContext { get; private set; }
+        public IRequestServices Client { get; private set; }
+        /// <summary>
+        /// Gets the Entity Framework storage context.
+        /// </summary>
+        public IStorageContext StorageContext { get; private set; }
 
-    public Storage(IStorageContext storageContext)
+    public Storage(IStorageContext storageContext,IRequestServices client)
     {
       if (!(storageContext is DbContext))
         throw new ArgumentException("The storageContext object must be an instance of the Microsoft.EntityFrameworkCore.DbContext class.");
 
       this.StorageContext = storageContext;
+        this.Client = client;
     }
 
     /// <summary>
@@ -39,7 +42,7 @@ public TRepository GetRepository<TRepository>() where TRepository : IRepository
       TRepository repository = ExtensionManager.GetInstance<TRepository>();
 
       if (repository != null)
-        repository.SetStorageContext(this.StorageContext);
+        repository.SetStorageContext(this.StorageContext,this.Client);
 
       return repository;
     }
diff --git a/src/ExtCore.Infrastructure/ExtensionBase.cs b/src/ExtCore.Infrastructure/ExtensionBase.cs
index 4b92b94..112e295 100644
--- a/src/ExtCore.Infrastructure/ExtensionBase.cs
+++ b/src/ExtCore.Infrastructure/ExtensionBase.cs
@@ -32,5 +32,14 @@ public abstract class ExtensionBase : IExtension
     /// Gets the authors of the extension (separated by commas).
     /// </summary>
     public virtual string Authors => null;
-  }
+    /// <summary>
+    /// Gets the heplper of the extension.
+    /// </summary>
+    public virtual string Helper => null;
+
+    /// <summary>
+    /// Gets the policy name of the extension.
+    /// </summary>
+    public virtual string Code => null;
+    }
 }
\ No newline at end of file
diff --git a/src/ExtCore.Infrastructure/IExtension.cs b/src/ExtCore.Infrastructure/IExtension.cs
index 96d6bc8..43fb6ad 100644
--- a/src/ExtCore.Infrastructure/IExtension.cs
+++ b/src/ExtCore.Infrastructure/IExtension.cs
@@ -32,5 +32,15 @@ public interface IExtension
     /// Gets the authors of the extension (separated by commas).
     /// </summary>
     string Authors { get; }
-  }
+
+    /// <summary>
+    /// Gets the heplper of the extension.
+    /// </summary>
+    string Helper { get; }
+
+    /// <summary>
+    /// Gets the policy code of the extension.
+    /// </summary>
+    string Code { get; }
+    }
 }
\ No newline at end of file