diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EfCoreRepositoryExtensions.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EfCoreRepositoryExtensions.cs
index e7f14c51d8..646259f941 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EfCoreRepositoryExtensions.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EfCoreRepositoryExtensions.cs
@@ -11,17 +11,17 @@ namespace Volo.Abp.Repositories
         public static DbContext GetDbContext<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository)
             where TEntity : class, IEntity<TPrimaryKey>, new()
         {
-            var efCoreRepository = repository as IEfCoreRepository;
-            if (efCoreRepository == null)
-            {
-                throw new ArgumentException("Given repository does not implement " + typeof(IEfCoreRepository).AssemblyQualifiedName, nameof(repository));
-            }
-
-            return efCoreRepository.DbContext;
+            return repository.ToEfCoreRepository().DbContext;
         }
 
         public static DbSet<TEntity> GetDbSet<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository)
             where TEntity : class, IEntity<TPrimaryKey>, new()
+        {
+            return repository.ToEfCoreRepository().DbSet;
+        }
+
+        public static IEfCoreRepository<TEntity, TPrimaryKey> ToEfCoreRepository<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository)
+            where TEntity : class, IEntity<TPrimaryKey>, new()
         {
             var efCoreRepository = repository as IEfCoreRepository<TEntity, TPrimaryKey>;
             if (efCoreRepository == null)
@@ -29,7 +29,7 @@ namespace Volo.Abp.Repositories
                 throw new ArgumentException("Given repository does not implement " + typeof(IEfCoreRepository<TEntity, TPrimaryKey>).AssemblyQualifiedName, nameof(repository));
             }
 
-            return efCoreRepository.DbSet;
+            return efCoreRepository;
         }
     }
 }
diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs
index 8958580e9f..f7754fd058 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@@ -12,11 +12,11 @@ namespace Volo.Abp.Repositories.EntityFrameworkCore
         where TDbContext : AbpDbContext<TDbContext>
         where TEntity : class, IEntity<TPrimaryKey>
     {
-        public virtual TDbContext DbContext => _dbContextProvider.GetDbContext();
-
         public virtual DbSet<TEntity> DbSet => DbContext.Set<TEntity>();
 
-        DbContext IEfCoreRepository.DbContext => DbContext;
+        DbContext IEfCoreRepository<TEntity, TPrimaryKey>.DbContext => DbContext;
+
+        protected virtual TDbContext DbContext => _dbContextProvider.GetDbContext();
 
         private readonly IDbContextProvider<TDbContext> _dbContextProvider;
 
diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/IEfCoreRepository.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/IEfCoreRepository.cs
index 684512d1d0..3f2d08f9f6 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/IEfCoreRepository.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/IEfCoreRepository.cs
@@ -1,16 +1,14 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
 
 namespace Volo.Abp.Repositories.EntityFrameworkCore
 {
-    public interface IEfCoreRepository
-    {
-        DbContext DbContext { get; }
-    }
-    
-    public interface IEfCoreRepository<TEntity, TPrimaryKey> : IEfCoreRepository
+    public interface IEfCoreRepository<TEntity, TPrimaryKey> : IQueryableRepository<TEntity, TPrimaryKey>
         where TEntity : class, IEntity<TPrimaryKey>
     {
+        DbContext DbContext { get; }
+
         DbSet<TEntity> DbSet { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs
index 72c05fdc2a..31e898ce2c 100644
--- a/src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs
+++ b/src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs
@@ -8,7 +8,7 @@ namespace Volo.DependencyInjection
 
         public ExposeServicesAttribute(params Type[] exposedServiceTypes)
         {
-            ExposedServiceTypes = exposedServiceTypes ?? new Type[];
+            ExposedServiceTypes = exposedServiceTypes ?? new Type[0];
         }
 
         public Type[] GetExposedServiceTypes()