diff --git a/app/controllers/devices.js b/app/controllers/devices.js
index 30c320b2..c787b57a 100644
--- a/app/controllers/devices.js
+++ b/app/controllers/devices.js
@@ -3,6 +3,9 @@ var devicesDb = require('../database').collection('devices');
 
 var jwt = require('jsonwebtoken');
 var config = require('../../config/config');
+var log = require('../logger');
+
+var os = require('os');
 
 /** createDevice() */
 exports.createDevice = function(req, res, next) {
@@ -14,8 +17,16 @@ exports.createDevice = function(req, res, next) {
         if (err)
             return next(err);
 
-        var token = jwt.sign(device, config.tokenSecret, {
-                expiresInMinutes: config.userTokenExpirePeriod
+        var signaturePayload = {
+            version: config.version
+        }
+
+        console.log(signaturePayload);
+
+        var token = jwt.sign(signaturePayload, config.tokenSecret, {
+            subject: 'Device Auth Token',
+            issuer: req.headers.host,
+            audience: device._id.toString()
         });
 
         res.json({
@@ -32,6 +43,8 @@ exports.createDevice = function(req, res, next) {
 exports.getAllDevices = function(req, res, next) {
 
 	console.log("req.headers['x-auth-token'] = ", req.headers['x-auth-token']);
+
+    log.info('hi');
 		
     devicesDb.find(req.body, function(err, devices) {
         if (err)
diff --git a/app/logger.js b/app/logger.js
new file mode 100644
index 00000000..7539e679
--- /dev/null
+++ b/app/logger.js
@@ -0,0 +1,4 @@
+var bunyan = require('bunyan');
+var log = bunyan.createLogger({name: "Mainflux"});
+
+module.exports = log
diff --git a/config/development.json b/config/development.json
index b8d39ace..ba598a5e 100644
--- a/config/development.json
+++ b/config/development.json
@@ -11,5 +11,6 @@
     "limiter" : {
         "defaultBurstRate": 50,
         "defaultRatePerSec": 0.5
-    }
+    },
+    "version": "0.1"
 }
diff --git a/server.js b/server.js
index 6e23be57..75b4b009 100644
--- a/server.js
+++ b/server.js
@@ -9,8 +9,7 @@ var restify = require('restify');
 var jwt = require('restify-jwt');
 var domain = require('domain');
 var config = require('./config/config');
-var bunyan = require('bunyan');
-var log = bunyan.createLogger({name: "Mainflux"});
+var log = require('./app/logger');
 
 /**
  * RESTIFY
diff --git a/utils/generateToken.js b/utils/generateToken.js
new file mode 100644
index 00000000..61e3c3d6
--- /dev/null
+++ b/utils/generateToken.js
@@ -0,0 +1,9 @@
+var jwt = require('jsonwebtoken');
+
+var config = require('../config/config');
+
+var token = jwt.sign({foo: 'bar'}, config.tokenSecret, {
+    expiresInMinutes: config.userTokenExpirePeriod
+});
+
+console.log(token);