diff --git a/Monstarlab.EntityFramework.Extension/Monstarlab.EntityFramework.Extension.csproj b/Monstarlab.EntityFramework.Extension/Monstarlab.EntityFramework.Extension.csproj
index 7c361a9..a97ae51 100644
--- a/Monstarlab.EntityFramework.Extension/Monstarlab.EntityFramework.Extension.csproj
+++ b/Monstarlab.EntityFramework.Extension/Monstarlab.EntityFramework.Extension.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <PackageId>Monstarlab.EntityFramework.Extension</PackageId>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Monstarlab</Authors>
     <Company>Monstarlab</Company>
     <Product>Entity Framework Extension</Product>
diff --git a/Monstarlab.EntityFramework.Extension/Repositories/BaseEntityRepository.cs b/Monstarlab.EntityFramework.Extension/Repositories/BaseEntityRepository.cs
index 8919ce6..c121df5 100644
--- a/Monstarlab.EntityFramework.Extension/Repositories/BaseEntityRepository.cs
+++ b/Monstarlab.EntityFramework.Extension/Repositories/BaseEntityRepository.cs
@@ -11,7 +11,7 @@ public BaseEntityRepository(TContext context)
 
     public virtual Task<TEntity> GetAsync(TId id) => BaseIncludes().FirstOrDefaultAsync(entity => entity.Id.Equals(id));
 
-    public async Task<TEntity> AddAsync(TEntity entity)
+    public virtual async Task<TEntity> AddAsync(TEntity entity)
     {
         if (entity == null)
             throw new ArgumentNullException(nameof(entity));
diff --git a/Monstarlab.EntityFramework.Extension/Repositories/EntityRepository.cs b/Monstarlab.EntityFramework.Extension/Repositories/EntityRepository.cs
index 90c35b2..ac0020b 100644
--- a/Monstarlab.EntityFramework.Extension/Repositories/EntityRepository.cs
+++ b/Monstarlab.EntityFramework.Extension/Repositories/EntityRepository.cs
@@ -31,7 +31,7 @@ public virtual Task<ListWrapper<TResult>> GetListWithSelectAsync<TResult>(
         return GetListAsync(selectedQuery, page, pageSize);
     }
 
-    public async virtual Task<IEnumerable<TEntity>> GetListAsync(
+    public virtual async Task<IEnumerable<TEntity>> GetListAsync(
         Expression<Func<TEntity, bool>>[] where = null,
         Expression<Func<TEntity, object>> orderByExpression = null,
         OrderBy orderBy = OrderBy.Ascending)
@@ -41,7 +41,7 @@ public async virtual Task<IEnumerable<TEntity>> GetListAsync(
         return await query.ToListAsync();
     }
 
-    public async virtual Task<IEnumerable<TResult>> GetListWithSelectAsync<TResult>(
+    public virtual async Task<IEnumerable<TResult>> GetListWithSelectAsync<TResult>(
         Expression<Func<TEntity, TResult>> select,
         Expression<Func<TEntity, bool>>[] where = null,
         Expression<Func<TEntity, object>> orderByExpression = null,
diff --git a/Monstarlab.EntityFramework.Extension/Repositories/EntitySoftDeleteRepository.cs b/Monstarlab.EntityFramework.Extension/Repositories/EntitySoftDeleteRepository.cs
index a74efc6..c061946 100644
--- a/Monstarlab.EntityFramework.Extension/Repositories/EntitySoftDeleteRepository.cs
+++ b/Monstarlab.EntityFramework.Extension/Repositories/EntitySoftDeleteRepository.cs
@@ -31,7 +31,7 @@ public virtual Task<ListWrapper<TEntity>> GetListAsync(
         return GetListAsync(query, page, pageSize);
     }
 
-    public async virtual Task<IEnumerable<TEntity>> GetListAsync(
+    public virtual async Task<IEnumerable<TEntity>> GetListAsync(
         Expression<Func<TEntity, bool>>[] where = null,
         Expression<Func<TEntity, object>> orderByExpression = null,
         OrderBy orderBy = OrderBy.Ascending,
@@ -57,7 +57,7 @@ public virtual Task<ListWrapper<TResult>> GetListWithSelectAsync<TResult>(Expres
         return GetListAsync(selectedQuery, page, pageSize);
     }
 
-    public async virtual Task<IEnumerable<TResult>> GetListWithSelectAsync<TResult>(Expression<Func<TEntity, TResult>> select,
+    public virtual async Task<IEnumerable<TResult>> GetListWithSelectAsync<TResult>(Expression<Func<TEntity, TResult>> select,
                                                                     Expression<Func<TEntity, bool>>[] where = null,
                                                                     Expression<Func<TEntity, object>> orderByExpression = null,
                                                                     OrderBy orderBy = OrderBy.Ascending,