diff --git a/docker/code-templates/nodejs/evernode-starter-client/_projname_.js b/docker/code-templates/nodejs/evernode-starter-client/_projname_.js
new file mode 100644
index 0000000..efb2558
--- /dev/null
+++ b/docker/code-templates/nodejs/evernode-starter-client/_projname_.js
@@ -0,0 +1,139 @@
+const fs = require('fs');
+const readline = require('readline');
+const bson = require('bson');
+const path = require("path");
+const HotPocket = require('hotpocket-js-client');
+
+async function clientApp() {
+
+    const keyFile = 'user.key';
+
+    // Re-generate a user key pair for the client.
+    if (process.argv[2] == 'generatekeys' || !fs.existsSync(keyFile)) {
+        const newKeyPair = await HotPocket.generateKeys();
+        const saveData = Buffer.from(newKeyPair.privateKey).toString('hex');
+        fs.writeFileSync(keyFile, saveData);
+        console.log('New key pair generated.');
+
+        if (process.argv[2] == 'generatekeys') {
+            const pkhex = Buffer.from(newKeyPair.publicKey).toString('hex');
+            console.log('My public key is: ' + pkhex);
+            return;
+        }
+    }
+
+    // Generate the key pair using saved private key data.
+    const savedPrivateKeyHex = fs.readFileSync(keyFile).toString();
+    const userKeyPair = await HotPocket.generateKeys(savedPrivateKeyHex);
+
+    const pkhex = Buffer.from(userKeyPair.publicKey).toString('hex');
+    console.log('My public key is: ' + pkhex);
+
+    const ip = process.argv[2] || 'localhost';
+    const port = process.argv[3] || '8080';
+    const client = await HotPocket.createClient(
+        ['wss://' + ip + ':' + port],
+        userKeyPair,
+        { protocol: HotPocket.protocols.bson }
+    );
+
+    // Establish HotPocket connection.
+    if (!await client.connect()) {
+        console.log('Connection failed.');
+        return;
+    }
+    console.log('HotPocket Connected.');
+
+    // start listening for stdin
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    // On ctrl + c we should close HP connection gracefully.
+    rl.on('SIGINT', () => {
+        console.log('SIGINT received...');
+        rl.close();
+        client.close();
+    });
+
+    // This will get fired if HP server disconnects unexpectedly.
+    client.on(HotPocket.events.disconnect, () => {
+        console.log('Disconnected');
+        rl.close();
+    });
+
+    // This will get fired when contract sends an output.
+    client.on(HotPocket.events.contractOutput, (r) => {
+
+        r.outputs.forEach(output => {
+            // If bson.deserialize error occured it'll be caught by this try catch.
+            try {
+                const result = bson.deserialize(output);
+                if (result.type == "uploadResult") {
+                    if (result.status == "ok")
+                        console.log(`(ledger:${r.ledgerSeqNo})>> ${result.message}`);
+                    else
+                        console.log(`(ledger:${r.ledgerSeqNo})>> Zip upload failed. reason: ${result.status}`);
+                }
+                else if (result.type == "statusResult") {
+                    if (result.status == "ok")
+                        console.log(`(ledger:${r.ledgerSeqNo})>> ${result.message}`);
+                    else
+                        console.log(`(ledger:${r.ledgerSeqNo})>> Status failed. reason: ${result.status}`);
+                }
+                else {
+                    console.log("Unknown contract output.");
+                }
+            }
+            catch (e) {
+                console.log(e)
+            }
+        });
+    });
+
+    console.log("Ready to accept inputs.");
+
+    const input_pump = () => {
+        rl.question('', async (inp) => {
+            if (inp.startsWith("status")) {
+                const input = await client.submitContractInput(bson.serialize({
+                    type: "status"
+                }));
+
+                const submission = await input.submissionStatus;
+                if (submission.status != "accepted")
+                    console.log("Status failed. reason: " + submission.reason);
+            }
+            else if (inp.startsWith("upload ")) {
+
+                const filePath = inp.substr(7);
+                const fileName = path.basename(filePath);
+                if (fs.existsSync(filePath)) {
+                    const fileContent = fs.readFileSync(filePath);
+                    const sizeKB = Math.round(fileContent.length / 1024);
+                    console.log("Uploading file " + fileName + " (" + sizeKB + " KB)");
+
+                    const input = await client.submitContractInput(bson.serialize({
+                        type: "upload",
+                        content: fileContent
+                    }));
+
+                    const submission = await input.submissionStatus;
+                    if (submission.status != "accepted")
+                        console.log("Upload failed. reason: " + submission.reason);
+                }
+                else
+                    console.log("File not found");
+            }
+            else {
+                console.log("Invalid command. [status] or [upload <local path>] expected.")
+            }
+
+            input_pump();
+        })
+    }
+    input_pump();
+}
+
+clientApp();
\ No newline at end of file
diff --git a/docker/code-templates/nodejs/evernode-starter-client/package.json b/docker/code-templates/nodejs/evernode-starter-client/package.json
new file mode 100644
index 0000000..2ec530f
--- /dev/null
+++ b/docker/code-templates/nodejs/evernode-starter-client/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "_projname_",
+    "dependencies": {
+        "hotpocket-js-client": "0.5.3"
+    }
+}
diff --git a/npm/lib/command-handler.js b/npm/lib/command-handler.js
index 2ffce39..4e58f94 100644
--- a/npm/lib/command-handler.js
+++ b/npm/lib/command-handler.js
@@ -38,10 +38,8 @@ function codeGen(platform, apptype, projName) {
         return;
     }
 
-    let containerStarted = false;
     try {
         runOnContainer(CONSTANTS.codegenContainerName, null, null, null, null, `${platform} ${apptype} ${projName}`, 'codegen');
-        containerStarted = true;
         exec(`docker cp ${CONSTANTS.codegenContainerName}:${CONSTANTS.codegenOutputDir} ./${projName}`);
         success(`Project '${projName}' created.`);
     }
@@ -49,7 +47,7 @@ function codeGen(platform, apptype, projName) {
         error(`Project '${projName}' generation failed.`);
     }
     finally {
-        if (containerStarted)
+        if (isExists(CONSTANTS.codegenContainerName))
             exec(`docker rm ${CONSTANTS.codegenContainerName}`, false);
     }
 }