diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/AdapterLauncher.cs b/Emscripten.Debugger.VSCodeDwarfDebug/AdapterLauncher.cs
index ef1d289..26bf72a 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/AdapterLauncher.cs
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/AdapterLauncher.cs
@@ -1,33 +1,78 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.
-
-using System;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Task = System.Threading.Tasks.Task;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Runtime;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Emscripten.DebuggerLauncher;
+using Microsoft.VisualStudio.Debugger.DebugAdapterHost.Interfaces;
+using Microsoft.VisualStudio.ProjectSystem.Debug;
 using Microsoft.VisualStudio.ProjectSystem.VS.Debug;
-using StreamJsonRpc;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
+using Newtonsoft.Json;
+using static System.Windows.Forms.Design.AxImporter;
 
 namespace Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug
 {
-    internal sealed class DebugEngineLauncher
+    public class AdapterLauncher : IAdapterLauncher, IDebugAdapterHostComponent
     {
-        static public async Task LaunchAsync(DebugLaunchSettings setting)
+        private IDebugAdapterHostContext context;
+
+        private Process debugServerProcess;
+
+        public void Initialize(IDebugAdapterHostContext context)
         {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+            // Save the context object provided by the Debug Adapter Host so we can use it to access services later
+            this.context = context;
+
+            context.Events.DebuggingEnded += OnDebugSessionEnded;
+        }
+
+        public void UpdateLaunchOptions(IAdapterLaunchInfo launchInfo)      
+        {
+            if (launchInfo.LaunchJson.Contains("__pendingTarget"))
+            {
+                // child target. ignore
+            } 
+            else 
+            {
+                LaunchDebugServer(launchInfo);
+            }
+        }
 
-            var obj = Package.GetGlobalService(typeof(SVsShellDebugger)) as IVsDebugger4;
-            var vsDebugTargetInfo = new VsDebugTargetInfo4
+        private void OnDebugSessionEnded(object sender, EventArgs e)
+        {
+            if (debugServerProcess != null && !debugServerProcess.HasExited)
             {
-                LaunchFlags = (uint)setting.LaunchOptions,
-                dlo = (uint)setting.LaunchOperation,
-                guidLaunchDebugEngine = setting.LaunchDebugEngineGuid,
-                bstrExe = setting.Executable,
-                bstrOptions = setting.Options
-            };
-            var _unused = new VsDebugTargetProcessInfo[1];
-
-            obj.LaunchDebugTargets4(1, new VsDebugTargetInfo4[1] { vsDebugTargetInfo }, _unused);
+                debugServerProcess.Kill();
+            }
         }
+
+        private void LaunchDebugServer(IAdapterLaunchInfo launchInfo)
+        {
+            var AdapterExecutable = launchInfo.GetMetricString("Adapter");
+            var AdapterArguments = launchInfo.GetMetricString("AdapterArgs");
+
+            var AdapterServerProcess = new Process();
+
+            AdapterServerProcess.StartInfo.FileName = AdapterExecutable;
+            AdapterServerProcess.StartInfo.Arguments = AdapterArguments;
+            AdapterServerProcess.StartInfo.WorkingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            // AdapterServerProcess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+
+            AdapterServerProcess.Start();
+
+            debugServerProcess = AdapterServerProcess;
+        }
+
+        public ITargetHostProcess LaunchAdapter(IAdapterLaunchInfo launchInfo, ITargetHostInterop targetInterop)
+        {
+            // nop
+            return null;
+        } 
     }
-}
\ No newline at end of file
+}
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/CustomMessageHandler.cs b/Emscripten.Debugger.VSCodeDwarfDebug/CustomMessageHandler.cs
index 0266c55..9e7a4ab 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/CustomMessageHandler.cs
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/CustomMessageHandler.cs
@@ -12,8 +12,6 @@
 
 namespace Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug
 {
-
-
     public class StartDebuggingRequestHandler : ICustomProtocolExtension
     {
         private IDebugAdapterHostContext context;
@@ -46,8 +44,9 @@ private void OnStartDebuggingRequest(IRequestResponder<StartDebuggingArgs, Start
             settings.LaunchOperation = DebugLaunchOperation.CreateProcess;
             settings.LaunchDebugEngineGuid = new Guid("9849C080-ECCF-46EE-9758-9F6F9ED68693");
             settings.Executable = "WebAssembly DWARF Debug";
-            responder.Arguments.Config.ConfigurationProperties["$debugServer"] = 8123;
-            settings.Options = JsonConvert.SerializeObject(responder.Arguments.Config);
+            var debugConfig = responder.Arguments.Configuration;
+            debugConfig.DebugServerPort = 8123;
+            settings.Options = JsonConvert.SerializeObject(debugConfig);
 
             ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
             {
@@ -59,8 +58,14 @@ private void OnStartDebuggingRequest(IRequestResponder<StartDebuggingArgs, Start
 
         internal class ConfigurationProperty
         {
-            [JsonExtensionData(ReadData = true, WriteData = true)]
-            public JObject ConfigurationProperties { get; set; }
+            [JsonProperty("type")]
+            public string Type { get; set; }
+            [JsonProperty("name")]
+            public string Name { get; set; }
+            [JsonProperty("__pendingTargetId")]
+            public string __PendingTargetId { get; set; }
+            [JsonProperty("$debugServer")]
+            public int DebugServerPort { get; set; }
         }
 
         internal class StartDebuggingArgs
@@ -69,7 +74,7 @@ internal class StartDebuggingArgs
             public string Request { get; set; }
 
             [JsonProperty("configuration")]
-            public ConfigurationProperty Config { get; set; }
+            public ConfigurationProperty Configuration { get; set; }
         }
 
         internal class StartDebuggingResponse : ResponseBody
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/DebugAdapter/src/dapDebugServer.js b/Emscripten.Debugger.VSCodeDwarfDebug/DebugAdapter/src/dapDebugServer.js
index 60679f3..cf29b3f 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/DebugAdapter/src/dapDebugServer.js
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/DebugAdapter/src/dapDebugServer.js
@@ -106,7 +106,7 @@ ${Oe()}}`}}var qo=class extends Error{constructor(t){super(t.text);this.details=
 `,vY=0,RH=class{constructor(e,t,n){this.inputStream=e;this.outputStream=t;this._contentLength=-1;this._connectionId=vY++;this.msgEmitter=new D;this.messageReceived=this.msgEmitter.event;this.endedEmitter=new D;this.closed=this.endedEmitter.event;this._handleData=e=>{var n;let t=new kr;for(this._rawData=Buffer.concat([this._rawData,e]);;){if(this._contentLength>=0){if(this._rawData.length>=this._contentLength){let i=this._rawData.toString("utf8",0,this._contentLength);if(this._rawData=this._rawData.slice(this._contentLength),this._contentLength=-1,i.length>0)try{let o=JSON.parse(i);(n=this.logger)==null||n.verbose("dap.receive",void 0,{connectionId:this._connectionId,message:o}),this.msgEmitter.fire({message:o,receivedTime:t})}catch(o){console.error("Error handling data: "+(o&&o.message))}continue}}else{let i=this._rawData.indexOf(L1);if(i!==-1){let s=this._rawData.toString("utf8",0,i).split(`\r
 `);for(let a=0;a<s.length;a++){let c=s[a].split(/: +/);c[0]==="Content-Length"&&(this._contentLength=+c[1])}this._rawData=this._rawData.slice(i+L1.length);continue}}break}};this.logger=n,this._rawData=Buffer.alloc(0),e.on("end",()=>this.endedEmitter.fire()),e.on("data",this._handleData)}send(e,t=!0,n){var s,a;let i=JSON.stringify(e);if(t){let c=e;e.type==="response"&&e.command==="source"&&(c={...e,body:{...e.body,content:"<script source>"}}),(s=this.logger)==null||s.verbose("dap.send",void 0,{connectionId:this._connectionId,message:c})}let o=`Content-Length: ${Buffer.byteLength(i,"utf8")}\r
 \r
-${i}`;if(this.outputStream.destroyed){(a=this.logger)==null||a.warn("dap.send","Message not sent. Connection was closed."),n==null||n();return}this.outputStream.write(o,"utf8",c=>{var u;n==null||n(),c&&(console.log(e),(u=this.logger)==null||u.error("dap.send","Error while writing to output stream",c),this.close())})}close(){this.inputStream.destroy(),this.outputStream.destroy()}setLogger(e){return this.logger=e,this}};process.env.L10N_FSPATH_TO_BUNDLE&&kH.config({fsPath:process.env.L10N_FSPATH_TO_BUNDLE});var IY=x1.mkdtempSync(OH.join(C1.tmpdir(),"vscode-js-debug-"));function _Y(r){let e,t=[],n=[],i=[],o=be(),s=0,a;return r.on("setBreakpoints",async c=>{var p;let u=((p=c.breakpoints)==null?void 0:p.map(()=>++s))??[];return t.push({params:c,ids:u}),{breakpoints:u.map(d=>({id:d,verified:!1,message:kH.t("breakpoint.provisionalBreakpoint","Unbound breakpoint")}))}}),r.on("setExceptionBreakpoints",async c=>(e=c,{})),r.on("setCustomBreakpoints",async c=>(n=c.ids,i=c.xhr,{})),r.on("configurationDone",async()=>(o.resolve(),{})),r.on("threads",async()=>({threads:[]})),r.on("loadedSources",async()=>({sources:[]})),r.on("initialize",async c=>(a=c,setTimeout(()=>r.initialized({}),0),As.capabilities())),new Promise(c=>{let u=async l=>{await o.promise;let p=be();if(!a)throw new Error("cannot call launch/attach before initialize");return c({initializeParams:a,setExceptionBreakpointsParams:e,setBreakpointsParams:t,customBreakpoints:n,xhrBreakpoints:i,launchParams:l,deferred:p}),p.promise};r.on("launch",l=>u(l)),r.on("attach",u)})}var C_=class{constructor(e,t){this.dapRoot=e;this.services=t;this.sessions=new Map}async acquireDap(e){var s;let t=this.sessions.get(e.id());if(t){let{connection:a}=await t.promise;return a}let n=e.parent(),i;if(n){let a=(s=this.sessions.get(n.id()))==null?void 0:s.settledValue;if(!a)throw new Error("Expected parent session to have a settled value");i=a.connection.dap()}else i=this.dapRoot;let o=be();return this.sessions.set(e.id(),o),i.startDebuggingRequest({request:e.launchConfig.request,configuration:{type:e.launchConfig.type,name:e.name(),__pendingTargetId:e.id()}}).catch(a=>o.reject(a)),o.promise.then(a=>a.connection)}async initAdapter(e,t){var i;let n=(i=this.sessions.get(t.id()))==null?void 0:i.settledValue;if(!n)throw new Error(`Expected to find pending init for target ${t.id()}`);n.setExceptionBreakpointsParams&&await e.setExceptionBreakpoints(n.setExceptionBreakpointsParams);for(let{params:o,ids:s}of n.setBreakpointsParams)await e.breakpointManager.setBreakpoints(o,s);return await e.setCustomBreakpoints({xhr:n.xhrBreakpoints,ids:n.customBreakpoints}),await e.onInitialize(n.initializeParams),await e.configurationDone(),await e.launchBlocker(),n.deferred.resolve({}),!0}releaseDap(e){this.sessions.delete(e.id())}hasPendingTarget(e){var t;return((t=this.sessions.get(e))==null?void 0:t.hasSettled())===!1}handleConnection(e){if(!("__pendingTargetId"in e.launchParams)||!e.launchParams.__pendingTargetId)throw new Error("Incoming session is missing __pendingTargetId");let t=e.launchParams.__pendingTargetId,n=this.sessions.get(t);if(!n)throw new Error(`__pendingTargetId ${t} not found`);n.resolve(e)}};function $1(r){let e=v1({storagePath:IY,isVsCode:!1}),t=new Set,n=D1.createServer(async i=>{try{let o=new Xc,s=new RH(i,i,o),a=new Xu(s,o),c=a.dap(),u=await _Y(c);if("__pendingTargetId"in u.launchParams){let l=u.launchParams.__pendingTargetId,p=l&&[...t].find(d=>d.hasPendingTarget(l));if(!p)throw new Error(`Cannot find pending target for ${l}`);o.connectTo(p.services.get(U)),p.handleConnection({...u,connection:a})}else{let l=b1(e),p=new C_(c,l);t.add(p),l.bind(Dt).toConstantValue(u.initializeParams),o.connectTo(l.get(U));let d=new CH(p,a,l,new cH("targetOrigin"));s.closed(()=>{d.dispose(),t.delete(p)}),u.deferred.resolve(await d.boot(u.launchParams,c))}}catch(o){return console.error(o),i.destroy()}}).on("error",i=>{console.error(i),process.exit(1)}).listen(r,()=>{let i=n.address();console.log(`Debug server listening at ${typeof i=="string"?i:`${i.address}:${i.port}`}`)})}var[,AY,D_="8123",wY="localhost"]=process.argv;process.argv.includes("--help")?console.log(`Usage: ${OH.basename(AY)} [port|socket path=8123] [host=localhost]`):isNaN(Number(D_))?$1({path:D_}):$1({port:Number(D_),host:wY});})();
+${i}`;if(this.outputStream.destroyed){(a=this.logger)==null||a.warn("dap.send","Message not sent. Connection was closed."),n==null||n();return}this.outputStream.write(o,"utf8",c=>{var u;n==null||n(),c&&(console.log(e),(u=this.logger)==null||u.error("dap.send","Error while writing to output stream",c),this.close())})}close(){this.inputStream.destroy(),this.outputStream.destroy()}setLogger(e){return this.logger=e,this}};process.env.L10N_FSPATH_TO_BUNDLE&&kH.config({fsPath:process.env.L10N_FSPATH_TO_BUNDLE});var IY=x1.mkdtempSync(OH.join(C1.tmpdir(),"vscode-js-debug-"));function _Y(r){let e,t=[],n=[],i=[],o=be(),s=0,a;return r.on("setBreakpoints",async c=>{var p;let u=((p=c.breakpoints)==null?void 0:p.map(()=>++s))??[];return t.push({params:c,ids:u}),{breakpoints:u.map(d=>({id:d,verified:!1,message:kH.t("breakpoint.provisionalBreakpoint","Unbound breakpoint")}))}}),r.on("setExceptionBreakpoints",async c=>(e=c,{})),r.on("setCustomBreakpoints",async c=>(n=c.ids,i=c.xhr,{})),r.on("configurationDone",async()=>(o.resolve(),{})),r.on("threads",async()=>({threads:[]})),r.on("loadedSources",async()=>({sources:[]})),r.on("initialize",async c=>(a=c,setTimeout(()=>r.initialized({}),0),As.capabilities())),new Promise(c=>{let u=async l=>{let p=be();if(!a)throw new Error("cannot call launch/attach before initialize");return c({initializeParams:a,setExceptionBreakpointsParams:e,setBreakpointsParams:t,customBreakpoints:n,xhrBreakpoints:i,launchParams:l,deferred:p}),p.promise};r.on("launch",l=>u(l)),r.on("attach",u)})}var C_=class{constructor(e,t){this.dapRoot=e;this.services=t;this.sessions=new Map}async acquireDap(e){var s;let t=this.sessions.get(e.id());if(t){let{connection:a}=await t.promise;return a}let n=e.parent(),i;if(n){let a=(s=this.sessions.get(n.id()))==null?void 0:s.settledValue;if(!a)throw new Error("Expected parent session to have a settled value");i=a.connection.dap()}else i=this.dapRoot;let o=be();return this.sessions.set(e.id(),o),i.startDebuggingRequest({request:e.launchConfig.request,configuration:{type:e.launchConfig.type,name:e.name(),__pendingTargetId:e.id()}}).catch(a=>o.reject(a)),o.promise.then(a=>a.connection)}async initAdapter(e,t){var i;let n=(i=this.sessions.get(t.id()))==null?void 0:i.settledValue;if(!n)throw new Error(`Expected to find pending init for target ${t.id()}`);n.setExceptionBreakpointsParams&&await e.setExceptionBreakpoints(n.setExceptionBreakpointsParams);for(let{params:o,ids:s}of n.setBreakpointsParams)await e.breakpointManager.setBreakpoints(o,s);return await e.setCustomBreakpoints({xhr:n.xhrBreakpoints,ids:n.customBreakpoints}),await e.onInitialize(n.initializeParams),await e.configurationDone(),await e.launchBlocker(),n.deferred.resolve({}),!0}releaseDap(e){this.sessions.delete(e.id())}hasPendingTarget(e){var t;return((t=this.sessions.get(e))==null?void 0:t.hasSettled())===!1}handleConnection(e){if(!("__pendingTargetId"in e.launchParams)||!e.launchParams.__pendingTargetId)throw new Error("Incoming session is missing __pendingTargetId");let t=e.launchParams.__pendingTargetId,n=this.sessions.get(t);if(!n)throw new Error(`__pendingTargetId ${t} not found`);n.resolve(e)}};function $1(r){let e=v1({storagePath:IY,isVsCode:!1}),t=new Set,n=D1.createServer(async i=>{try{let o=new Xc,s=new RH(i,i,o),a=new Xu(s,o),c=a.dap(),u=await _Y(c);if("__pendingTargetId"in u.launchParams){let l=u.launchParams.__pendingTargetId,p=l&&[...t].find(d=>d.hasPendingTarget(l));if(!p)throw new Error(`Cannot find pending target for ${l}`);o.connectTo(p.services.get(U)),p.handleConnection({...u,connection:a})}else{let l=b1(e),p=new C_(c,l);t.add(p),l.bind(Dt).toConstantValue(u.initializeParams),o.connectTo(l.get(U));let d=new CH(p,a,l,new cH("targetOrigin"));s.closed(()=>{d.dispose(),t.delete(p)}),u.deferred.resolve(await d.boot(u.launchParams,c))}}catch(o){return console.error(o),i.destroy()}}).on("error",i=>{console.error(i),process.exit(1)}).listen(r,()=>{let i=n.address();console.log(`Debug server listening at ${typeof i=="string"?i:`${i.address}:${i.port}`}`)})}var[,AY,D_="8123",wY="localhost"]=process.argv;process.argv.includes("--help")?console.log(`Usage: ${OH.basename(AY)} [port|socket path=8123] [host=localhost]`):isNaN(Number(D_))?$1({path:D_}):$1({port:Number(D_),host:wY});})();
 /*! Bundled license information:
 
 reflect-metadata/Reflect.js:
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/DebugEngineLauncher.cs b/Emscripten.Debugger.VSCodeDwarfDebug/DebugEngineLauncher.cs
new file mode 100644
index 0000000..2166c3c
--- /dev/null
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/DebugEngineLauncher.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using Microsoft.VisualStudio.ProjectSystem.VS.Debug;
+using Microsoft.VisualStudio.Debugger.DebugAdapterHost.Interfaces;
+using System.IO;
+using System.Diagnostics;
+
+namespace Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug
+{
+    internal class LaunchedTarget : ITargetHostProcess, IDisposable
+    {
+        private Process target;
+
+        public IntPtr Handle => target.Handle;
+
+        public Stream StandardInput => target.StandardInput.BaseStream;
+
+        public Stream StandardOutput => target.StandardOutput.BaseStream;
+
+        public bool HasExited => target.HasExited;
+
+        public event EventHandler Exited;
+        public event DataReceivedEventHandler ErrorDataReceived;
+
+        public LaunchedTarget(Process process)
+        { 
+            target = process;
+
+            target.Exited += OnExited;
+            target.ErrorDataReceived += OnErrorDataReceived;
+        }
+
+        public void Terminate()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+            target.Exited -= OnExited;
+            target.ErrorDataReceived -= OnErrorDataReceived;
+
+            ((IDisposable)target).Dispose();
+        }
+
+        private void OnExited(object sender, EventArgs e)
+        {
+            Exited(sender, e);
+        }
+
+        private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            ErrorDataReceived(sender, e);
+        }
+    }
+
+    internal sealed class DebugEngineLauncher
+    {
+        static public async System.Threading.Tasks.Task<ITargetHostProcess> LaunchAsync(DebugLaunchSettings setting)
+        {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+            
+            var obj = Package.GetGlobalService(typeof(SVsShellDebugger)) as IVsDebugger4;
+            var vsDebugTargetInfo = new VsDebugTargetInfo4
+            {
+                LaunchFlags = (uint)setting.LaunchOptions,
+                dlo = (uint)setting.LaunchOperation,
+                guidLaunchDebugEngine = setting.LaunchDebugEngineGuid,
+                bstrExe = setting.Executable,
+                bstrOptions = setting.Options
+            };
+            var launchedProcess = new VsDebugTargetProcessInfo[1];
+
+            obj.LaunchDebugTargets4(1, new VsDebugTargetInfo4[1] { vsDebugTargetInfo }, launchedProcess);
+
+            return new LaunchedTarget(Process.GetProcessById((int)launchedProcess[0].dwProcessId));
+        }
+
+        static public ITargetHostProcess Launch(DebugLaunchSettings setting)
+        {
+            var obj = Package.GetGlobalService(typeof(SVsShellDebugger)) as IVsDebugger4;
+            var vsDebugTargetInfo = new VsDebugTargetInfo4
+            {
+                LaunchFlags = (uint)setting.LaunchOptions,
+                dlo = (uint)setting.LaunchOperation,
+                guidLaunchDebugEngine = setting.LaunchDebugEngineGuid,
+                bstrExe = setting.Executable,
+                bstrOptions = setting.Options
+            };
+            var launchedProcess = new VsDebugTargetProcessInfo[1];
+
+            obj.LaunchDebugTargets4(1, new VsDebugTargetInfo4[1] { vsDebugTargetInfo }, launchedProcess);
+
+            return new LaunchedTarget(Process.GetProcessById((int)launchedProcess[0].dwProcessId));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.csproj b/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.csproj
index c1c5d4c..da4031d 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.csproj
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.csproj
@@ -67,6 +67,11 @@
     <DeployExtension>False</DeployExtension>
     <CreateVsixContainer>True</CreateVsixContainer>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AdapterLauncher.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VsPackage.cs" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
@@ -471,7 +476,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdapterLauncher.cs" />
+    <Compile Include="DebugEngineLauncher.cs" />
     <Compile Include="CustomMessageHandler.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -487,6 +492,9 @@
     <PackageReference Include="Microsoft.VisualStudio.Shared.VSCodeDebugProtocol">
       <Version>15.6.20118.1</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Framework">
+      <Version>15.9.28307</Version>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
@@ -499,8 +507,19 @@
       <Version>7.10.6072</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Emscripten.DebuggerLauncher\Emscripten.DebuggerLauncher.csproj">
+      <Project>{66908fce-3a52-477b-87b5-acde7984de68}</Project>
+      <Name>Emscripten.DebuggerLauncher</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Target Name="IncludeNuGetPackageReferences" AfterTargets="GetVsixSourceItems">
+    <ItemGroup>
+      <VSIXSourceItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != ''" />
+    </ItemGroup>
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.pkgdef b/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.pkgdef
index dad58e2..b59f084 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.pkgdef
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.pkgdef
@@ -4,6 +4,11 @@
 "Class"="Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug.StartDebuggingRequestHandler"
 "CodeBase"="$PackageFolder$\Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug.dll"
 
+; Adapter Launcher Extension
+[$RootKey$\CLSID\{89B1AE26-954B-41A1-A713-88731D9958FE}]
+"Assembly"="Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug"
+"Class"="Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug.AdapterLauncher"
+"CodeBase"="$PackageFolder$\Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug.dll"
 
 [$RootKey$\AD7Metrics\Engine\{9849C080-ECCF-46EE-9758-9F6F9ED68693}]
 "Name"="WebAssembly DWARF Debug"
@@ -18,7 +23,6 @@
 "ConditionalBP"=dword:00000001
 "Exceptions"=dword:00000001
 "ExceptionBreakpointCategory"="{1ce4d9f7-faac-42ee-b352-87fdfb6fb37b}"
-"UseEngineForNonDebugLaunch"=dword:00000001
 "DebugEngineType"="javascript"
 @="VSCode Debugger Host"
 
@@ -30,4 +34,5 @@
 "Adapter"="%EMSDK_NODE%"
 "AdapterArgs"="--experimental-wasm-threads --experimental-wasm-simd "$PackageFolder$\DebugAdapter\src\dapDebugServer.js" 8123 127.0.0.1"
 
+"AdapterLauncher"="{89B1AE26-954B-41A1-A713-88731D9958FE}"
 "CustomProtocolExtension"="{05EFD122-20D3-4FB8-8C72-E4BBEEA19FD3}"
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/Properties/AssemblyInfo.cs b/Emscripten.Debugger.VSCodeDwarfDebug/Properties/AssemblyInfo.cs
index d5bda30..cf79363 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/Properties/AssemblyInfo.cs
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/Properties/AssemblyInfo.cs
@@ -1,15 +1,16 @@
-using System.Reflection;
+using Microsoft.VisualStudio.Shell;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Emscripten.Debug.VSCode")]
+[assembly: AssemblyTitle("Emscripten.Debugger.VSCodeDWARFDebug")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Emscripten.Debug.VSCode")]
+[assembly: AssemblyProduct("Emscripten.Debugger.VSCodeDWARFDebug")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/VsPackage.cs b/Emscripten.Debugger.VSCodeDwarfDebug/VsPackage.cs
index 9d52f90..370c78e 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/VsPackage.cs
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/VsPackage.cs
@@ -1,4 +1,4 @@
-namespace Emscripten.Debugger.VSCodeDwarfDebug.Definition
+namespace Kamenokosoft.Emscripten.Debugger.VSCodeDwarfDebug
 {
     using Microsoft.VisualStudio.Shell;
     using System.Runtime.InteropServices;
@@ -16,8 +16,6 @@ public sealed class VsPackage : Package
         /// The default namespace this project compiles with, so that manifest
         /// resource names can be calculated for embedded resources.
         /// </summary>
-        internal const string DefaultNamespace = "Emscripten.Debugger.VSCodeDwarfDebug.Definition";
-
-
+        internal const string DefaultNamespace = "Emscripten.Debugger.VSCodeDwarfDebug";
     }
 }
\ No newline at end of file
diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/source.extension.vsixmanifest b/Emscripten.Debugger.VSCodeDwarfDebug/source.extension.vsixmanifest
index 0e46d0b..6709ae3 100644
--- a/Emscripten.Debugger.VSCodeDwarfDebug/source.extension.vsixmanifest
+++ b/Emscripten.Debugger.VSCodeDwarfDebug/source.extension.vsixmanifest
@@ -5,7 +5,7 @@
         <DisplayName>VSCode WebAssembly Debugger</DisplayName>
         <Description xml:space="preserve">This extension will provide WebAssembly debugger used in VSCode.</Description>
     </Metadata>
-    <Installation>
+    <Installation AllUsers="true">
         <InstallationTarget Version="[15.0, 17.0)" Id="Microsoft.VisualStudio.BuildTools">
             <ProductArchitecture>x86</ProductArchitecture>
         </InstallationTarget>
diff --git a/Emscripten.DebuggerLauncher/VSCodeDebuggerLaunchProvider.cs b/Emscripten.DebuggerLauncher/VSCodeDebuggerLaunchProvider.cs
index dc5e436..a6864b3 100644
--- a/Emscripten.DebuggerLauncher/VSCodeDebuggerLaunchProvider.cs
+++ b/Emscripten.DebuggerLauncher/VSCodeDebuggerLaunchProvider.cs
@@ -46,7 +46,7 @@ public override async Task<IReadOnlyList<IDebugLaunchSettings>> QueryDebugTarget
             // 1: Debug Adapter Server Process
             var serverSettings = new DebugLaunchSettings(launchOptions);
             serverSettings.LaunchOperation = DebugLaunchOperation.CreateProcess;
-            serverSettings.LaunchOptions = DebugLaunchOptions.CannotDebugAlone | DebugLaunchOptions.TerminateOnStop;
+            serverSettings.LaunchOptions = DebugLaunchOptions.TerminateOnStop;
             serverSettings.Executable = @"WebAssembly Debug Server";
             serverSettings.LaunchDebugEngineGuid = new Guid("9849C080-ECCF-46EE-9758-9F6F9ED68693");
             serverSettings.Options = "{}";
@@ -80,13 +80,13 @@ public override async Task<IReadOnlyList<IDebugLaunchSettings>> QueryDebugTarget
             webServerProcess.Start();
 
             webServerProcessSetting.LaunchOperation = DebugLaunchOperation.AlreadyRunning;
-            webServerProcessSetting.LaunchOptions = DebugLaunchOptions.CannotDebugAlone | DebugLaunchOptions.TerminateOnStop;
+            webServerProcessSetting.LaunchOptions = DebugLaunchOptions.TerminateOnStop;
             webServerProcessSetting.Executable = webServerProcess.ProcessName;
             webServerProcessSetting.ProcessId = webServerProcess.Id;
 
             webServerProcessSetting.LaunchDebugEngineGuid = DebuggerEngines.NativeOnlyEngine;
 
-            return new IDebugLaunchSettings[] { serverSettings, clientSettings, webServerProcessSetting };
+            return new IDebugLaunchSettings[] { clientSettings, webServerProcessSetting };
         }
     }
 }