5 files changed, 13 insertions, 6 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index cf4504b2..8846cc83 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -14,6 +14,7 @@ namespace WixToolset.Core.Burn
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     // TODO: (4.0) Refactor so that these don't need to be copied.
diff --git a/src/WixToolset.Core.Burn/BundleBackend.cs b/src/WixToolset.Core.Burn/BundleBackend.cs
index 83d33c8a..63504df2 100644
--- a/src/WixToolset.Core.Burn/BundleBackend.cs
+++ b/src/WixToolset.Core.Burn/BundleBackend.cs
@@ -7,8 +7,8 @@ namespace WixToolset.Core.Burn
     using WixToolset.Core.Burn.Bundles;
     using WixToolset.Core.Burn.Inscribe;
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
 
     internal class BundleBackend : IBackend
     {
diff --git a/src/WixToolset.Core.Burn/BurnBackendFactory.cs b/src/WixToolset.Core.Burn/BurnBackendFactory.cs
index 5da3a0cb..5f98ada9 100644
--- a/src/WixToolset.Core.Burn/BurnBackendFactory.cs
+++ b/src/WixToolset.Core.Burn/BurnBackendFactory.cs
@@ -5,11 +5,11 @@ namespace WixToolset.Core.Burn
     using System;
     using System.IO;
     using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
+    using WixToolset.Extensibility.Data;
 
     internal class BurnBackendFactory : IBackendFactory
     {
-        public bool TryCreateBackend(string outputType, string outputFile, WixToolset.Extensibility.IBindContext context, out IBackend backend)
+        public bool TryCreateBackend(string outputType, string outputFile, IBindContext context, out IBackend backend)
         {
             if (String.IsNullOrEmpty(outputType))
             {
diff --git a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
index 0dea8b1d..e87f4360 100644
--- a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
@@ -5,16 +5,22 @@ namespace WixToolset.Core.Burn.Inscribe
     using System.IO;
     using WixToolset.Core.Burn.Bundles;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
 
     internal class InscribeBundleCommand
     {
         public InscribeBundleCommand(IInscribeContext context)
         {
             this.Context = context;
-        }
 
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
+        }
+        
         private IInscribeContext Context { get; }
 
+        public IMessaging Messaging { get; }
+
         public bool Execute()
         {
             bool inscribed = false;
@@ -29,7 +35,7 @@ namespace WixToolset.Core.Burn.Inscribe
                 {
                     reader.Stream.Seek(reader.AttachedContainerAddress, SeekOrigin.Begin);
 
-                    using (BurnWriter writer = BurnWriter.Open(this.Context.Messaging, tempFile))
+                    using (BurnWriter writer = BurnWriter.Open(this.Messaging, tempFile))
                     {
                         writer.RememberThenResetSignature();
                         writer.AppendContainer(reader.Stream, reader.AttachedContainerSize, BurnCommon.Container.Attached);
diff --git a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs
index 26af056b..37f64312 100644
--- a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs
+++ b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Core.Burn.Inscribe
     using System;
     using System.IO;
     using WixToolset.Core.Burn.Bundles;
-    using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
 
     internal class InscribeBundleEngineCommand
     {