diff --git a/lib/handlers_v4.js b/lib/handlers_v4.js
index b0e0c4e..9c94a60 100755
--- a/lib/handlers_v4.js
+++ b/lib/handlers_v4.js
@@ -88,17 +88,15 @@ function execute_request(request) {
     // Ensure stdin, stdout and stderr streams are sent to this request
     this.lastExecuteRequest = request;
 
-    var task = {
-        action: "run",
-        code: request.content.code,
-        beforeRun: beforeRun.bind(this),
-        afterRun: afterRun.bind(this),
-        onSuccess: onSuccess.bind(this),
-        onError: onError.bind(this)
-    };
-    this.session.run(task);
+    this.session.execute(
+        request.content.code,
+        onSuccess.bind(this),
+        onError.bind(this),
+        beforeRun.bind(this),
+        afterRun.bind(this)
+    );
 
-    function beforeRun(session) {
+    function beforeRun() {
         this.executionCount++;
         request.respond(
             this.iopubSocket,
@@ -109,9 +107,9 @@ function execute_request(request) {
         );
     }
 
-    function afterRun(session) {}
+    function afterRun() {}
 
-    function onSuccess(session) {
+    function onSuccess(result) {
         request.respond(
             this.shellSocket,
             "execute_reply", {
@@ -124,7 +122,7 @@ function execute_request(request) {
         );
 
         if (this.hideUndefined &&
-            session.result.mime["text/plain"] === "undefined") {
+            result.mime["text/plain"] === "undefined") {
             return;
         }
 
@@ -132,31 +130,33 @@ function execute_request(request) {
             this.iopubSocket,
             "pyout", {
                 execution_count: this.executionCount,
-                data: session.result.mime,
+                data: result.mime,
                 metadata: {},
             }
         );
     }
 
-    function onError(session) {
+    function onError(result) {
         request.respond(
             this.shellSocket,
             "execute_reply", {
                 status: "error",
                 execution_count: this.executionCount,
-                ename: session.result.error.ename,
-                evalue: session.result.error.evalue,
-                traceback: session.result.error.traceback,
-            });
+                ename: result.error.ename,
+                evalue: result.error.evalue,
+                traceback: result.error.traceback,
+            }
+        );
 
         request.respond(
             this.iopubSocket,
             "pyerr", {
                 execution_count: this.executionCount,
-                ename: session.result.error.ename,
-                evalue: session.result.error.evalue,
-                traceback: session.result.error.traceback,
-            });
+                ename: result.error.ename,
+                evalue: result.error.evalue,
+                traceback: result.error.traceback,
+            }
+        );
     }
 }
 
@@ -175,16 +175,16 @@ function complete_request(request) {
     );
     return;
 
-    function onSuccess(session) {
+    function onSuccess(result) {
         var content = {
-            "matches": session.result.completion.list,
-            "matched_text": session.result.completion.matchedText,
+            "matches": result.completion.list,
+            "matched_text": result.completion.matchedText,
             "status": "ok",
         };
         request.respond(this.shellSocket, "complete_reply", content);
     }
 
-    function onError(session) {
+    function onError(result) {
         var content = {
             "matches": [],
             "matched_text": request.content.text,
@@ -209,7 +209,7 @@ function object_info_request(request) {
     );
     return;
 
-    function onSuccess(session) {
+    function onSuccess(result) {
         var content = {
             oname: request.content.oname,
             found: true,
@@ -217,44 +217,42 @@ function object_info_request(request) {
             isalias: false,
         };
 
-        if (session.result.inspection) {
-            content.string_name = session.result.inspection.string;
+        if (result.inspection) {
+            content.string_name = result.inspection.string;
 
-            if (session.result.inspection.list) {
-                if (session.result.inspection.list.length >= 1) {
-                    content.type_name = session.result.inspection.list[0];
+            if (result.inspection.list) {
+                if (result.inspection.list.length >= 1) {
+                    content.type_name = result.inspection.list[0];
                 } else {
-                    content.type_name = session.result.inspection.type;
+                    content.type_name = result.inspection.type;
                 }
 
-                if (session.result.inspection.list.length >= 2) {
-                    content.base_name = session.result.inspection.list[1];
+                if (result.inspection.list.length >= 2) {
+                    content.base_name = result.inspection.list[1];
                 }
             }
 
-            if (session.result.inspection.length) {
-                content.length = session.result.inspection.length;
+            if (result.inspection.length) {
+                content.length = result.inspection.length;
             }
 
             content.docstring = (
-                session.result.inspection.type +
-                ": " +
-                session.result.inspection.string
+                result.inspection.type + ": " + result.inspection.string
             );
         }
 
-        if (session.result.doc) {
+        if (result.doc) {
             content.namespace = "builtin";
-            content.docstring = session.result.doc.description;
-            if (session.result.doc.usage) {
-                content.definition = session.result.doc.usage;
+            content.docstring = result.doc.description;
+            if (result.doc.usage) {
+                content.definition = result.doc.usage;
             }
         }
 
         request.respond(this.shellSocket, "object_info_reply", content);
     }
 
-    function onError(session) {
+    function onError(result) {
         var content = {
             oname: request.content.oname,
             found: false,
diff --git a/lib/handlers_v5.js b/lib/handlers_v5.js
index 8e2e889..bd76232 100755
--- a/lib/handlers_v5.js
+++ b/lib/handlers_v5.js
@@ -109,17 +109,15 @@ function execute_request(request) {
     // Ensure stdin, stdout and stderr streams are sent to this request
     this.lastExecuteRequest = request;
 
-    var task = {
-        action: "run",
-        code: request.content.code,
-        beforeRun: beforeRun.bind(this),
-        afterRun: afterRun.bind(this),
-        onSuccess: onSuccess.bind(this),
-        onError: onError.bind(this)
-    };
-    this.session.run(task);
+    this.session.execute(
+        request.content.code,
+        onSuccess.bind(this),
+        onError.bind(this),
+        beforeRun.bind(this),
+        afterRun.bind(this)
+    );
 
-    function beforeRun(session) {
+    function beforeRun() {
         this.executionCount++;
         request.respond(
             this.iopubSocket,
@@ -130,9 +128,9 @@ function execute_request(request) {
         );
     }
 
-    function afterRun(session) {}
+    function afterRun() {}
 
-    function onSuccess(session) {
+    function onSuccess(result) {
         request.respond(
             this.shellSocket,
             "execute_reply", {
@@ -144,7 +142,7 @@ function execute_request(request) {
         );
 
         if (this.hideUndefined &&
-            session.result.mime["text/plain"] === "undefined") {
+            result.mime["text/plain"] === "undefined") {
             return;
         }
 
@@ -152,31 +150,33 @@ function execute_request(request) {
             this.iopubSocket,
             "execute_result", {
                 execution_count: this.executionCount,
-                data: session.result.mime,
+                data: result.mime,
                 metadata: {},
             }
         );
     }
 
-    function onError(session) {
+    function onError(result) {
         request.respond(
             this.shellSocket,
             "execute_reply", {
                 status: "error",
                 execution_count: this.executionCount,
-                ename: session.result.error.ename,
-                evalue: session.result.error.evalue,
-                traceback: session.result.error.traceback,
-            });
+                ename: result.error.ename,
+                evalue: result.error.evalue,
+                traceback: result.error.traceback,
+            }
+        );
 
         request.respond(
             this.iopubSocket,
             "error", {
                 execution_count: this.executionCount,
-                ename: session.result.error.ename,
-                evalue: session.result.error.evalue,
-                traceback: session.result.error.traceback,
-            });
+                ename: result.error.ename,
+                evalue: result.error.evalue,
+                traceback: result.error.traceback,
+            }
+        );
     }
 }
 
@@ -195,17 +195,17 @@ function complete_request(request) {
     );
     return;
 
-    function onSuccess(session) {
+    function onSuccess(result) {
         var content = {
-            matches: session.result.completion.list,
-            cursor_start: session.result.completion.cursorStart,
-            cursor_end: session.result.completion.cursorEnd,
+            matches: result.completion.list,
+            cursor_start: result.completion.cursorStart,
+            cursor_end: result.completion.cursorEnd,
             status: "ok",
         };
         request.respond(this.shellSocket, "complete_reply", content);
     }
 
-    function onError(session) {
+    function onError(result) {
         var content = {
             matches: [],
             cursor_start: request.content.cursor_pos,
@@ -231,21 +231,19 @@ function inspect_request(request) {
     );
     return;
 
-    function onSuccess(session) {
+    function onSuccess(result) {
         var docstring;
 
-        if (session.result.inspection) {
+        if (result.inspection) {
             docstring = (
-                session.result.inspection.type +
-                ": " +
-                session.result.inspection.string
+                result.inspection.type + ": " + result.inspection.string
             );
         }
 
-        if (session.result.doc) {
-            docstring = session.result.doc.usage;
-            if (session.result.doc.usage) {
-                docstring += "\n\n" + session.result.doc.description;
+        if (result.doc) {
+            docstring = result.doc.usage;
+            if (result.doc.usage) {
+                docstring += "\n\n" + result.doc.description;
             }
         }
 
@@ -261,13 +259,13 @@ function inspect_request(request) {
         request.respond(this.shellSocket, "inspect_reply", content);
     }
 
-    function onError(session) {
+    function onError(result) {
         var content = {
             status: "error",
             execution_count: this.executionCount,
-            ename: session.result.error.ename,
-            evalue: session.result.error.evalue,
-            traceback: session.result.error.traceback,
+            ename: result.error.ename,
+            evalue: result.error.evalue,
+            traceback: result.error.traceback,
         };
         request.respond(this.shellSocket, "inspect_reply", content);
     }
diff --git a/lib/kernel.js b/lib/kernel.js
index 1bc023b..785998f 100755
--- a/lib/kernel.js
+++ b/lib/kernel.js
@@ -393,7 +393,7 @@ Kernel.prototype._runStartupScripts = function() {
             startupScripts = [];
         }
     } else {
-            startupScripts = [];
+        startupScripts = [];
     }
 
     if (DEBUG) console.log("KERNEL: STARTUP: " + startupScripts);
@@ -409,19 +409,15 @@ Kernel.prototype._runStartupScripts = function() {
             return;
         }
 
-        var task = {
-            action: "run",
-            code: code,
-            onSuccess: function() {
+        this.session.execute(code, function onSuccess() {
                 var msg = "KERNEL: STARTUP: '" + script + "' run successfuly";
                 if (DEBUG) console.log(msg);
             },
-            onError: function() {
+            function onError() {
                 var msg = "KERNEL: STARTUP: '" + script + "' failed to run";
                 if (DEBUG) console.log(msg);
-            },
-        };
-        this.session.run(task);
+            }
+        );
     }).bind(this));
 };
 
diff --git a/package.json b/package.json
index f8edf36..7852b71 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     },
     "dependencies": {
         "jmp": "0.2.x",
-        "nel": "0.2.x",
+        "nel": "0.3.x",
         "node-uuid": "^1.4.2"
     },
     "devDependencies": {