diff --git a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj
index b956fcd01c..9a29ff2af5 100644
--- a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj
+++ b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj
@@ -4,18 +4,17 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>b31ffae3-5dac-4e51-bd17-f7446b741a36</ProjectGuid>
-    <RootNamespace>Volo.Abp.MongoDB</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbDatabaseApi.cs b/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbDatabaseApi.cs
new file mode 100644
index 0000000000..acc867d515
--- /dev/null
+++ b/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbDatabaseApi.cs
@@ -0,0 +1,22 @@
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver;
+
+namespace Volo.Abp.Uow.MongoDB
+{
+    public class MongoDbDatabaseApi: IDatabaseApi
+    {
+        public IMongoDatabase Database { get; }
+
+        public MongoDbDatabaseApi(IMongoDatabase database)
+        {
+            Database = database;
+        }
+
+        public Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())
+        {
+            //TODO: Does MongoDB has such a feature?
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Volo.Abp/Volo/Abp/Data/DatabaseNameAttribute.cs b/src/Volo.Abp/Volo/Abp/Data/DatabaseNameAttribute.cs
index e810971ac8..88a14363a7 100644
--- a/src/Volo.Abp/Volo/Abp/Data/DatabaseNameAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/Data/DatabaseNameAttribute.cs
@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 
 namespace Volo.Abp.Data
 {
+    //TODO: Rename DatabaseNameAttribute to ConnectionStringNameAttribute
     public class DatabaseNameAttribute : Attribute
     {
         [NotNull]