diff --git a/src/Dynamicweb.DataIntegration.Providers.OrderProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.OrderProvider.csproj
index 2723692..2147887 100644
--- a/src/Dynamicweb.DataIntegration.Providers.OrderProvider.csproj
+++ b/src/Dynamicweb.DataIntegration.Providers.OrderProvider.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.8.0</Version>
+		<Version>10.8.1</Version>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Order Provider</Title>
 		<Description>Order Provider</Description>
diff --git a/src/OrderProvider.cs b/src/OrderProvider.cs
index 489597d..f0bcb5c 100644
--- a/src/OrderProvider.cs
+++ b/src/OrderProvider.cs
@@ -150,6 +150,10 @@ Schema ISource.GetSchema()
         return Schema;
     }
 
+    string ISource.GetId() => "Source|OrderProvider";
+
+    string IDestination.GetId() => "Destination|OrderProvider";
+
     public OrderProvider(XmlNode xmlNode)
     {
         foreach (XmlNode node in xmlNode.ChildNodes)
@@ -232,7 +236,8 @@ void ISource.SaveAsXml(XmlTextWriter xmlTextWriter)
         xmlTextWriter.WriteElementString("DiscardDuplicates", DiscardDuplicates.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("RemoveMissingOrderLines", RemoveMissingOrderLines.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("SkipFailingRows", SkipFailingRows.ToString());
-        (this as ISource).GetSchema().SaveAsXml(xmlTextWriter);
+        if (!Feature.IsActive<SchemaManagementFeature>())
+            (this as ISource).GetSchema().SaveAsXml(xmlTextWriter);
     }
 
     void IDestination.SaveAsXml(XmlTextWriter xmlTextWriter)
@@ -245,7 +250,8 @@ void IDestination.SaveAsXml(XmlTextWriter xmlTextWriter)
         xmlTextWriter.WriteElementString("DiscardDuplicates", DiscardDuplicates.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("RemoveMissingOrderLines", RemoveMissingOrderLines.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("SkipFailingRows", SkipFailingRows.ToString());
-        (this as IDestination).GetSchema().SaveAsXml(xmlTextWriter);
+        if (!Feature.IsActive<SchemaManagementFeature>())
+            (this as IDestination).GetSchema().SaveAsXml(xmlTextWriter);
     }
 
     public override void UpdateSourceSettings(ISource source)
@@ -380,7 +386,7 @@ public override bool RunJob(Job job)
             sqlTransaction = Connection.BeginTransaction();
             foreach (OrderDestinationWriter writer in writers)
             {
-                TotalRowsAffected += writer.MoveDataToMainTable(sqlTransaction, false, false);
+                writer.MoveDataToMainTable(sqlTransaction, false, false);
             }
 
             RemoveMissingRows(writers, sqlTransaction);