diff --git a/src/com/connectsdk/discovery/DiscoveryManager.java b/src/com/connectsdk/discovery/DiscoveryManager.java
index 815aa723..7dc29d1d 100644
--- a/src/com/connectsdk/discovery/DiscoveryManager.java
+++ b/src/com/connectsdk/discovery/DiscoveryManager.java
@@ -381,10 +381,10 @@ public void registerDefaultDeviceTypes() {
                 "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
         //devicesList.put("com.connectsdk.service.NetcastTVService",
         // "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
-        devicesList.put("com.connectsdk.service.DLNAService",
-         "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
-        devicesList.put("com.connectsdk.service.DIALService",
-         "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
+        //devicesList.put("com.connectsdk.service.DLNAService",
+        // "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
+        //devicesList.put("com.connectsdk.service.DIALService",
+        // "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
         // devicesList.put("com.connectsdk.service.RokuService",
         // "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
         // devicesList.put("com.connectsdk.service.CastService",
diff --git a/src/com/connectsdk/service/DIALService.java b/src/com/connectsdk/service/DIALService.java
index d0a85d27..e010a8d7 100644
--- a/src/com/connectsdk/service/DIALService.java
+++ b/src/com/connectsdk/service/DIALService.java
@@ -115,11 +115,11 @@ public CapabilityPriorityLevel getLauncherCapabilityLevel() {
     }
 
     @Override
-    public void launchApp(String appId, AppLaunchListener listener) {
+    public void launchApp(String appId, ResponseListener<LaunchSession> listener) {
         launchApp(appId, null, listener);
     }
 
-    private void launchApp(String appId, JSONObject params, AppLaunchListener listener) {
+    private void launchApp(String appId, JSONObject params, ResponseListener<LaunchSession> listener) {
         if (appId == null || appId.length() == 0) {
             Util.postError(listener, new ServiceCommandError(0, "Must pass a valid appId", null));
             return;
@@ -133,12 +133,12 @@ private void launchApp(String appId, JSONObject params, AppLaunchListener listen
     }
 
     @Override
-    public void launchAppWithInfo(AppInfo appInfo, AppLaunchListener listener) {
+    public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
         launchAppWithInfo(appInfo, null, listener);
     }
 
     @Override
-    public void launchAppWithInfo(final AppInfo appInfo, Object params, final AppLaunchListener listener) {
+    public void launchAppWithInfo(final AppInfo appInfo, Object params, final ResponseListener<LaunchSession> listener) {
         ServiceCommand<ResponseListener<Object>> command =
                 new ServiceCommand<ResponseListener<Object>>(getCommandProcessor(),
                         requestURL(appInfo.getName()), params, new ResponseListener<Object>() {
@@ -163,7 +163,7 @@ public void onSuccess(Object object) {
     }
 
     @Override
-    public void launchBrowser(String url, AppLaunchListener listener) {
+    public void launchBrowser(String url, ResponseListener<LaunchSession> listener) {
         Util.postError(listener, ServiceCommandError.notSupported());
     }
 
@@ -199,12 +199,12 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchYouTube(String contentId, AppLaunchListener listener) {
+    public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
         launchYouTube(contentId, (float) 0.0, listener);
     }
 
     @Override
-    public void launchYouTube(String contentId, float startTime, AppLaunchListener listener) {
+    public void launchYouTube(String contentId, float startTime, ResponseListener<LaunchSession> listener) {
         String params = null;
         AppInfo appInfo = new AppInfo(APP_YOUTUBE);
         appInfo.setName(appInfo.getId());
@@ -236,12 +236,12 @@ public void launchYouTube(String contentId, float startTime, AppLaunchListener l
     }
 
     @Override
-    public void launchHulu(String contentId, AppLaunchListener listener) {
+    public void launchHulu(String contentId, ResponseListener<LaunchSession> listener) {
         Util.postError(listener, ServiceCommandError.notSupported());
     }
 
     @Override
-    public void launchNetflix(final String contentId, AppLaunchListener listener) {
+    public void launchNetflix(final String contentId, ResponseListener<LaunchSession> listener) {
         JSONObject params = null;
 
         if (contentId != null && contentId.length() > 0) {
@@ -261,7 +261,7 @@ public void launchNetflix(final String contentId, AppLaunchListener listener) {
     }
 
     @Override
-    public void launchAppStore(String appId, AppLaunchListener listener) {
+    public void launchAppStore(String appId, ResponseListener<LaunchSession> listener) {
         Util.postError(listener, ServiceCommandError.notSupported());
     }
 
diff --git a/src/com/connectsdk/service/NetcastTVService.java b/src/com/connectsdk/service/NetcastTVService.java
index 80468904..6702f0af 100644
--- a/src/com/connectsdk/service/NetcastTVService.java
+++ b/src/com/connectsdk/service/NetcastTVService.java
@@ -489,7 +489,7 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchApp(final String appId, final AppLaunchListener listener) {
+    public void launchApp(final String appId, final ResponseListener<LaunchSession> listener) {
         getAppInfoForId(appId, new AppInfoListener() {
 
             @Override
@@ -525,7 +525,7 @@ public void onSuccess(List<AppInfo> object) {
         });
     }
 
-    private void launchApplication(final String appName, final String auid, final String contentId, final Launcher.AppLaunchListener listener) {
+    private void launchApplication(final String appName, final String auid, final String contentId, final ResponseListener<LaunchSession> listener) {
         JSONObject jsonObj = new JSONObject();
 
         try {
@@ -572,12 +572,12 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchAppWithInfo(AppInfo appInfo, Launcher.AppLaunchListener listener) {
+    public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
         launchAppWithInfo(appInfo, null, listener);
     }
 
     @Override
-    public void launchAppWithInfo(AppInfo appInfo, Object params, Launcher.AppLaunchListener listener) {
+    public void launchAppWithInfo(AppInfo appInfo, Object params, ResponseListener<LaunchSession> listener) {
         String appName = HttpMessage.encode(appInfo.getName());
         String appId = appInfo.getId();
         String contentId = null;
@@ -597,7 +597,7 @@ public void launchAppWithInfo(AppInfo appInfo, Object params, Launcher.AppLaunch
     }
 
     @Override
-    public void launchBrowser(String url, final Launcher.AppLaunchListener listener) {
+    public void launchBrowser(String url, final ResponseListener<LaunchSession> listener) {
         if (!(url == null || url.length() == 0)) 
             Log.w(Util.T, "Netcast TV does not support deeplink for Browser");
 
@@ -619,12 +619,12 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchYouTube(String contentId, Launcher.AppLaunchListener listener) {
+    public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
         launchYouTube(contentId, (float)0.0, listener);
     }
 
     @Override
-    public void launchYouTube(final String contentId, float startTime, final AppLaunchListener listener) {
+    public void launchYouTube(final String contentId, float startTime, final ResponseListener<LaunchSession> listener) {
         if (getDIALService() != null) {
             getDIALService().getLauncher().launchYouTube(contentId, startTime, listener);
             return;
@@ -650,7 +650,7 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchHulu(final String contentId, final Launcher.AppLaunchListener listener) {
+    public void launchHulu(final String contentId, final ResponseListener<LaunchSession> listener) {
         final String appName = "Hulu";
 
         getApplication(appName, new AppInfoListener() {
@@ -668,7 +668,7 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchNetflix(final String contentId, final Launcher.AppLaunchListener listener) {
+    public void launchNetflix(final String contentId, final ResponseListener<LaunchSession> listener) {
         if (!serviceDescription.getModelNumber().equals("4.0")) {
             launchApp("Netflix", listener);
             return;
@@ -734,7 +734,7 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchAppStore(final String appId, final AppLaunchListener listener) {
+    public void launchAppStore(final String appId, final ResponseListener<LaunchSession> listener) {
         if (!serviceDescription.getModelNumber().equals("4.0")) {
             launchApp("LG Smart World", listener);  // TODO: this will not work in Korea, use Korean name instead
             return;
@@ -1392,7 +1392,7 @@ public CapabilityPriorityLevel getExternalInputControlPriorityLevel() {
     }
 
     @Override
-    public void launchInputPicker(final AppLaunchListener listener) {
+    public void launchInputPicker(final ResponseListener<LaunchSession> listener) {
         final String appName = "Input List";
         final String encodedStr = HttpMessage.encode(appName);
 
@@ -1400,7 +1400,7 @@ public void launchInputPicker(final AppLaunchListener listener) {
 
             @Override
             public void onSuccess(final AppInfo appInfo) {
-                Launcher.AppLaunchListener launchListener = new Launcher.AppLaunchListener() {
+                ResponseListener<LaunchSession> launchListener = new ResponseListener<LaunchSession>() {
 
                     @Override
                     public void onSuccess(LaunchSession session) {
diff --git a/src/com/connectsdk/service/RokuService.java b/src/com/connectsdk/service/RokuService.java
index 9e793b74..aa1e3d5d 100644
--- a/src/com/connectsdk/service/RokuService.java
+++ b/src/com/connectsdk/service/RokuService.java
@@ -145,7 +145,7 @@ public void close(ResponseListener<Object> responseListener) {
     }
 
     @Override
-    public void launchApp(String appId, AppLaunchListener listener) {
+    public void launchApp(String appId, ResponseListener<LaunchSession> listener) {
         if (appId == null) {
             Util.postError(listener, new ServiceCommandError(0,
                     "Must supply a valid app id", null));
@@ -159,14 +159,13 @@ public void launchApp(String appId, AppLaunchListener listener) {
     }
 
     @Override
-    public void launchAppWithInfo(AppInfo appInfo,
-            Launcher.AppLaunchListener listener) {
+    public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
         launchAppWithInfo(appInfo, null, listener);
     }
 
     @Override
     public void launchAppWithInfo(final AppInfo appInfo, Object params,
-            final Launcher.AppLaunchListener listener) {
+            final ResponseListener<LaunchSession> listener) {
         if (appInfo == null || appInfo.getId() == null) {
             Util.postError(listener, new ServiceCommandError(-1,
                     "Cannot launch app without valid AppInfo object",
@@ -324,19 +323,17 @@ public ServiceSubscription<AppStateListener> subscribeAppState(
     }
 
     @Override
-    public void launchBrowser(String url, Launcher.AppLaunchListener listener) {
+    public void launchBrowser(String url, ResponseListener<LaunchSession> listener) {
         Util.postError(listener, ServiceCommandError.notSupported());
     }
 
     @Override
-    public void launchYouTube(String contentId,
-            Launcher.AppLaunchListener listener) {
+    public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
         launchYouTube(contentId, (float) 0.0, listener);
     }
 
     @Override
-    public void launchYouTube(String contentId, float startTime,
-            AppLaunchListener listener) {
+    public void launchYouTube(String contentId, float startTime, ResponseListener<LaunchSession> listener) {
         if (getDIALService() != null) {
             getDIALService().getLauncher().launchYouTube(contentId, startTime,
                     listener);
@@ -349,8 +346,7 @@ public void launchYouTube(String contentId, float startTime,
     }
 
     @Override
-    public void launchNetflix(final String contentId,
-            final Launcher.AppLaunchListener listener) {
+    public void launchNetflix(final String contentId, final ResponseListener<LaunchSession> listener) {
         getAppList(new AppListListener() {
 
             @Override
@@ -381,7 +377,7 @@ public void onError(ServiceCommandError error) {
 
     @Override
     public void launchHulu(final String contentId,
-            final Launcher.AppLaunchListener listener) {
+            final ResponseListener<LaunchSession> listener) {
         getAppList(new AppListListener() {
 
             @Override
@@ -408,7 +404,7 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchAppStore(final String appId, AppLaunchListener listener) {
+    public void launchAppStore(final String appId, ResponseListener<LaunchSession> listener) {
         AppInfo appInfo = new AppInfo("11");
         appInfo.setName("Channel Store");
 
diff --git a/src/com/connectsdk/service/WebOSTVService.java b/src/com/connectsdk/service/WebOSTVService.java
index 23745d4c..7e9563e8 100644
--- a/src/com/connectsdk/service/WebOSTVService.java
+++ b/src/com/connectsdk/service/WebOSTVService.java
@@ -408,7 +408,7 @@ public CapabilityPriorityLevel getLauncherCapabilityLevel() {
     }
 
     @Override
-    public void launchApp(String appId, AppLaunchListener listener) {
+    public void launchApp(String appId, ResponseListener<LaunchSession> listener) {
         AppInfo appInfo = new AppInfo();
         appInfo.setId(appId);
 
@@ -416,12 +416,12 @@ public void launchApp(String appId, AppLaunchListener listener) {
     }
 
     @Override
-    public void launchAppWithInfo(AppInfo appInfo, Launcher.AppLaunchListener listener) {
+    public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
         launchAppWithInfo(appInfo, null, listener);
     }
 
     @Override
-    public void launchAppWithInfo(final AppInfo appInfo, Object params, final Launcher.AppLaunchListener listener) {
+    public void launchAppWithInfo(final AppInfo appInfo, Object params, final ResponseListener<LaunchSession> listener) {
         String uri = "ssap://system.launcher/launch";
         JSONObject payload = new JSONObject();
 
@@ -478,7 +478,7 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchBrowser(String url, final Launcher.AppLaunchListener listener) {
+    public void launchBrowser(String url, final ResponseListener<LaunchSession> listener) {
         String uri = "ssap://system.launcher/open";
         JSONObject payload = new JSONObject();
 
@@ -516,12 +516,12 @@ public void onError(ServiceCommandError error) {
     }
 
     @Override
-    public void launchYouTube(String contentId, Launcher.AppLaunchListener listener) {
+    public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
         launchYouTube(contentId, (float) 0.0, listener);
     }
 
     @Override
-    public void launchYouTube(final String contentId, float startTime, final AppLaunchListener listener) {
+    public void launchYouTube(final String contentId, float startTime, final ResponseListener<LaunchSession> listener) {
         JSONObject params = new JSONObject();
 
         if (contentId != null && contentId.length() > 0) {
@@ -549,7 +549,7 @@ public void launchYouTube(final String contentId, float startTime, final AppLaun
     }
 
     @Override
-    public void launchHulu(String contentId, Launcher.AppLaunchListener listener) {
+    public void launchHulu(String contentId, ResponseListener<LaunchSession> listener) {
         JSONObject params = new JSONObject();
 
         try {
@@ -569,7 +569,7 @@ public void launchHulu(String contentId, Launcher.AppLaunchListener listener) {
     }
 
     @Override
-    public void launchNetflix(String contentId, Launcher.AppLaunchListener listener) {
+    public void launchNetflix(String contentId, ResponseListener<LaunchSession> listener) {
         JSONObject params = new JSONObject();
         String netflixContentId = "m=http%3A%2F%2Fapi.netflix.com%2Fcatalog%2Ftitles%2Fmovies%2F" + contentId
                 + "&source_type=4";
@@ -591,7 +591,7 @@ public void launchNetflix(String contentId, Launcher.AppLaunchListener listener)
     }
 
     @Override
-    public void launchAppStore(String appId, AppLaunchListener listener) {
+    public void launchAppStore(String appId, ResponseListener<LaunchSession> listener) {
         AppInfo appInfo = new AppInfo("com.webos.app.discovery");
         appInfo.setName("LG Store");
 
@@ -1801,7 +1801,7 @@ public CapabilityPriorityLevel getExternalInputControlPriorityLevel() {
     }
 
     @Override
-    public void launchInputPicker(final AppLaunchListener listener) {
+    public void launchInputPicker(final ResponseListener<LaunchSession> listener) {
         final AppInfo appInfo = new AppInfo() {
             {
                 setId("com.webos.app.inputpicker");
@@ -1809,7 +1809,7 @@ public void launchInputPicker(final AppLaunchListener listener) {
             }
         };
 
-        launchAppWithInfo(appInfo, null, new AppLaunchListener() {
+        launchAppWithInfo(appInfo, null, new ResponseListener<LaunchSession>() {
             @Override
             public void onSuccess(LaunchSession object) {
                 listener.onSuccess(object);
diff --git a/src/com/connectsdk/service/capability/ExternalInputControl.java b/src/com/connectsdk/service/capability/ExternalInputControl.java
index 066e61bb..ccc87c4d 100644
--- a/src/com/connectsdk/service/capability/ExternalInputControl.java
+++ b/src/com/connectsdk/service/capability/ExternalInputControl.java
@@ -26,7 +26,6 @@
 import java.util.List;
 
 import com.connectsdk.core.ExternalInputInfo;
-import com.connectsdk.service.capability.Launcher.AppLaunchListener;
 import com.connectsdk.service.capability.listeners.ResponseListener;
 import com.connectsdk.service.sessions.LaunchSession;
 
@@ -49,7 +48,7 @@ public interface ExternalInputControl extends CapabilityMethods {
     public ExternalInputControl getExternalInput();
     public CapabilityPriorityLevel getExternalInputControlPriorityLevel();
 
-    public void launchInputPicker(AppLaunchListener listener);
+    public void launchInputPicker(ResponseListener<LaunchSession> listener);
     public void closeInputPicker(LaunchSession launchSessionm, ResponseListener<Object> listener);
 
     public void getExternalInputList(ExternalInputListListener listener);
diff --git a/src/com/connectsdk/service/capability/Launcher.java b/src/com/connectsdk/service/capability/Launcher.java
index ff003faf..d76cca67 100644
--- a/src/com/connectsdk/service/capability/Launcher.java
+++ b/src/com/connectsdk/service/capability/Launcher.java
@@ -77,9 +77,9 @@ public interface Launcher extends CapabilityMethods {
     public Launcher getLauncher();
     public CapabilityPriorityLevel getLauncherCapabilityLevel();
 
-    public void launchAppWithInfo(AppInfo appInfo, AppLaunchListener listener);
-    public void launchAppWithInfo(AppInfo appInfo, Object params, AppLaunchListener listener);
-    public void launchApp(String appId, AppLaunchListener listener);
+    public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener);
+    public void launchAppWithInfo(AppInfo appInfo, Object params, ResponseListener<LaunchSession> listener);
+    public void launchApp(String appId, ResponseListener<LaunchSession> listener);
 
     public void closeApp(LaunchSession launchSession, ResponseListener<Object> listener);
 
@@ -91,20 +91,14 @@ public interface Launcher extends CapabilityMethods {
     public void getAppState(LaunchSession launchSession, AppStateListener listener);
     public ServiceSubscription<AppStateListener> subscribeAppState(LaunchSession launchSession, AppStateListener listener);
 
-    public void launchBrowser(String url, AppLaunchListener listener);
-    public void launchYouTube(String contentId, AppLaunchListener listener);
-    public void launchYouTube(String contentId, float startTime, AppLaunchListener listener);
-    public void launchNetflix(String contentId, AppLaunchListener listener);
-    public void launchHulu(String contentId, AppLaunchListener listener);
-    public void launchAppStore(String appId, AppLaunchListener listener);
-
-    /**
-     * Success listener that is called upon successfully launching an app.
-     *
-     * Passes a LaunchSession Object containing important information about the app's launch session
-     */
-    public static interface AppLaunchListener extends ResponseListener<LaunchSession> { }
+    public void launchBrowser(String url, ResponseListener<LaunchSession>  listener);
+    public void launchYouTube(String contentId, ResponseListener<LaunchSession>  listener);
+    public void launchYouTube(String contentId, float startTime, ResponseListener<LaunchSession>  listener);
+    public void launchNetflix(String contentId, ResponseListener<LaunchSession>  listener);
+    public void launchHulu(String contentId, ResponseListener<LaunchSession> listener);
+    public void launchAppStore(String appId, ResponseListener<LaunchSession> listener);
 
+    
     /**
      * Success listener that is called upon requesting info about the current running app.
      *