diff --git a/Core.Thalos.Domain/Core.Thalos.Domain.csproj b/Core.Thalos.Domain/Core.Thalos.Domain.csproj
index d8a522a..2bc93c7 100644
--- a/Core.Thalos.Domain/Core.Thalos.Domain.csproj
+++ b/Core.Thalos.Domain/Core.Thalos.Domain.csproj
@@ -8,7 +8,11 @@
 
   <ItemGroup>
     <PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.3" />
-    <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.2" />
+    <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\shared libs\Core.Thalos.BuildingBlocks\Core.Thalos.BuildingBlocks\Core.Thalos.BuildingBlocks.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs b/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs
index 8188bd2..29509b5 100644
--- a/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs
+++ b/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs
@@ -403,7 +403,14 @@ namespace Core.Thalos.Provider.Providers.Onboarding
                             .Select(p => BsonSerializer.Deserialize<PermissionAdapter>(p.AsBsonDocument))
                             .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active)
                             .ToList()
-                        : new List<PermissionAdapter>()
+                        : new List<PermissionAdapter>(),
+                    Modules = result.Contains("modules") && result["modules"].IsBsonArray
+                    ? result["modules"].AsBsonArray
+                        .Where(p => p != null && p.IsBsonDocument)
+                        .Select(p => BsonSerializer.Deserialize<ModuleAdapter>(p.AsBsonDocument))
+                        .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active)
+                        .ToList()
+                    : new List<ModuleAdapter>()
                 };