diff --git a/data/views/redfish-1.0/wsman.1.0.0.lclogentry.1.0.0.json b/data/views/redfish-1.0/wsman.1.0.0.lclogentry.1.0.0.json
new file mode 100644
index 000000000..d42b60bf5
--- /dev/null
+++ b/data/views/redfish-1.0/wsman.1.0.0.lclogentry.1.0.0.json
@@ -0,0 +1,32 @@
+{
+    "@odata.context" : "<%= basepath %>/$metadata#Systems/Links/Members/<%= identifier %>/LogServices/Members/<%=type%>/$entity",
+    "@odata.id": "<%= basepath %>/Systems/<%=identifier%>/LogServices/<%=type%>/Entries/<%= entry.recordId %>",
+    "@odata.type": "#LogEntry.1.0.0.LogEntry",
+    "Oem": {
+        "Dell":{
+            "Log Name": "<%= entry.logName %>",
+            "Category": "<%= entry.category %>",
+			"Entry Id": "<%= entry.instanceId %>",
+            "Severity": "<%= entry.severity %>",
+            "Comment": "<%= entry.comment %>",
+            "Agent": "<%= entry.agentId %>",
+            "fqdd": "<%= entry.fqdd %>",
+            "Raw Event Data": "<%= entry.rawEventData %>",
+            "Sequence Number": "<%= entry.sequenceNumber %>"
+        }
+    },
+    "Id": "<%= entry.recordId %>",
+    "Name": "<%= entry.elementName %>",
+    "EntryType": "Oem",
+    "Created": "<%= entry.creationTimeStamp %>",
+    "OemRecordFormat": "",
+    "Message": "<%= entry.message %>",
+    "MessageId": "<%= entry.messageId %>",
+    "MessageArgs": ["<%= entry.messageArguments %>"],
+    "Links": {
+        "Oem": {},
+        "OriginOfCondition": {
+            "@odata.id": "<%= entry.origin || 'null' %>"
+        }
+    }
+}
diff --git a/data/views/redfish-1.0/wsman.1.0.0.lclogentrycollection.json b/data/views/redfish-1.0/wsman.1.0.0.lclogentrycollection.json
new file mode 100644
index 000000000..b4a9dcdcf
--- /dev/null
+++ b/data/views/redfish-1.0/wsman.1.0.0.lclogentrycollection.json
@@ -0,0 +1,44 @@
+{
+    "@odata.context" : "<%= basepath %>/$metadata#Systems/Links/Members/<%= identifier %>/LogServices/Members/<%=type%>/Entries",
+    "@odata.id": "<%= url %>",
+    "@odata.type": "#LogEntryCollection.LogEntryCollection",
+    "Oem" : {},
+    "Name": "Log Service Entry Collection",
+    "Members@odata.count": <%= logEntries.length %>,
+    "Members": [
+        <% logEntries.forEach(function(entry, i, arr) { %>
+            {
+                "@odata.id": "<%= basepath %>/Systems/<%=identifier%>/LogServices/<%=type%>/Entries/<%= entry.recordId %>",
+                "@odata.type": "#LogEntry.1.0.0.LogEntry",
+                "Oem": {
+                    "Dell":{
+                        "Log Name": "<%= entry.logName %>",
+                        "Category": "<%= entry.category %>",
+                        "Severity": "<%= entry.severity %>",
+                        "Comment": "<%= entry.comment %>",
+                        "Agent": "<%= entry.agentId %>",
+                        "fqdd": "<%= entry.fqdd %>",
+                        "Raw Event Data": "<%= entry.rawEventData %>",
+                        "Sequence Number": "<%= entry.sequenceNumber %>"
+                    }
+                },
+                "Id": "<%= entry.recordId %>",
+                "Name": "<%= entry.elementName %>",
+                "EntryType": "<%= type %>",
+                "Created": "<%= entry.creationTimeStamp %>",
+                "OemRecordFormat": "",
+                "EntryCode": "<%= entry.instanceId %>",
+                "Message": "<%= entry.message %>",
+                "MessageId": "<%= entry.messageId %>",
+                "MessageArgs": ["<%= entry.messageArguments %>"],
+                "Links": {
+                    "Oem": {},
+                    "OriginOfCondition": {
+                        "@odata.id": "<%= entry.origin || 'null' %>"
+                    }
+                }
+            }
+            <%= ( arr.length > 0 && i < arr.length-1 ) ? ',': '' %>
+        <% }); %>
+    ]
+}
diff --git a/data/views/redfish-1.0/wsman.1.0.0.logentry.1.0.0.json b/data/views/redfish-1.0/wsman.1.0.0.logentry.1.0.0.json
new file mode 100644
index 000000000..a7ff901c1
--- /dev/null
+++ b/data/views/redfish-1.0/wsman.1.0.0.logentry.1.0.0.json
@@ -0,0 +1,25 @@
+{
+    "@odata.context" : "<%= basepath %>/$metadata#Systems/Links/Members/<%= identifier %>/LogServices/Members/<%=type%>/$entity",
+    "@odata.id": "<%= basepath %>/Systems/<%=identifier%>/LogServices/<%=type%>/Entries/<%= entry.logId %>",
+    "@odata.type": "#LogEntry.1.0.0.LogEntry",
+    "Oem": {
+        "Dell":{
+            "instanceID": "<%= entry.instanceID %>",
+            "perceivedSeverity": "<%= entry.perceivedSeverity %>"
+        }
+    },
+    "Id": "<%= entry.recordID %>",
+    "Name": "<%= entry.elementName %>",
+    "EntryType": "<%= type %>",
+    "Created": "<%= entry.creationTimeStamp %>",
+    "OemRecordFormat": "",
+    "Message": "<%= entry.recordData %>",
+    "MessageId": "",
+    "MessageArgs": [],
+    "Links": {
+        "Oem": {},
+        "OriginOfCondition": {
+            "@odata.id": "<%= entry.origin || 'null' %>"
+        }
+    }
+}
diff --git a/data/views/redfish-1.0/wsman.1.0.0.logentrycollection.json b/data/views/redfish-1.0/wsman.1.0.0.logentrycollection.json
new file mode 100644
index 000000000..0f4d1ec44
--- /dev/null
+++ b/data/views/redfish-1.0/wsman.1.0.0.logentrycollection.json
@@ -0,0 +1,38 @@
+{
+    "@odata.context" : "<%= basepath %>/$metadata#Systems/Links/Members/<%= identifier %>/LogServices/Members/<%=type%>/Entries",
+    "@odata.id": "<%= url %>",
+    "@odata.type": "#LogEntryCollection.LogEntryCollection",
+    "Oem" : {},
+    "Name": "Log Service Entry Collection",
+    "Members@odata.count": <%= logEntries.length %>,
+    "Members": [
+        <% logEntries.forEach(function(entry, i, arr) { %>
+            {
+                "@odata.id": "<%= basepath %>/Systems/<%=identifier%>/LogServices/<%=type%>/Entries/<%= entry.recordID %>",
+                "@odata.type": "#LogEntry.1.0.0.LogEntry",
+                "Oem": {
+                    "Dell":{
+						"Log Name": "<%= entry.logName %>",
+                        "Instance Id": "<%= entry.instanceID %>",
+						"Perceived Severity": "<%= entry.perceivedSeverity %>"
+                    }
+                },
+                "Id": "<%= entry.recordID %>",
+                "Name": "<%= entry.elementName %>",
+                "EntryType": "<%= type %>",
+                "Created": "<%= entry.creationTimeStamp %>",
+                "OemRecordFormat": "",
+                "Message": "<%= entry.recordData %>",
+                "MessageId": "",
+                "MessageArgs": [],
+                "Links": {
+                    "Oem": {},
+                    "OriginOfCondition": {
+                        "@odata.id": "<%= entry.origin || 'null' %>"
+                    }
+                }
+            }
+            <%= ( arr.length > 0 && i < arr.length-1 ) ? ',': '' %>
+        <% }); %>
+    ]
+}
diff --git a/lib/api/redfish-1.0/systems.js b/lib/api/redfish-1.0/systems.js
index ca9d48a6f..98c7c2a0a 100755
--- a/lib/api/redfish-1.0/systems.js
+++ b/lib/api/redfish-1.0/systems.js
@@ -13,6 +13,7 @@ var controller = injector.get('Http.Services.Swagger').controller;
 var Errors = injector.get('Errors');
 var moment = require('moment');
 var racadm = injector.get('JobUtils.RacadmTool');
+var wsman = injector.get('Http.Services.Wsman');
 
 var dataFactory = function(identifier, dataName) {
     switch(dataName)  {
@@ -224,16 +225,10 @@ var getSystem = controller(function(req, res) {
     var options = redfish.makeOptions(req, res, identifier);
     options.systemType = 'Physical';
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-//        if(/^[0-9|A-Z]{7}$/.test(node.name)){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-        if(dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.props({
                 hardware: dataFactory(identifier, 'hardware'),
                 boot: dataFactory(identifier, 'boot'),
@@ -250,14 +245,13 @@ var getSystem = controller(function(req, res) {
                         return obms;
                     })
             }).then(function(data) {
-                return redfish.render('wsman.1.0.0.computersystem.1.0.0.json',
+                return redfish.render('redfish.2016.3.computersystem.1.3.0.json',
                                 'ComputerSystem.v1_3_0.json#/definitions/ComputerSystem',
                                 _.merge(options, data));
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
         } else {
-
             return Promise.props({
                 ohai: dataFactory(identifier, 'ohai'),
                 dmi: dataFactory(identifier, 'dmi'),
@@ -293,16 +287,10 @@ var listSystemProcessors = controller(function(req, res)  {
     var identifier = req.swagger.params.identifier.value;
     var options = redfish.makeOptions(req, res, identifier);
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-//        if(/^[0-9|A-Z]{7}$/.test(node.name)){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-        if(dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return dataFactory(identifier, 'hardware').then(function(hardware) {
                 options.hardware = hardware;
             }).then(function(){
@@ -340,16 +328,10 @@ var getSystemProcessor = controller(function(req, res)  {
     var identifier = req.swagger.params.identifier.value;
     var options = redfish.makeOptions(req, res, identifier);
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-//        if(/^[0-9|A-Z]{7}$/.test(node.name)){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-        if(dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.props({
                 socketId: req.swagger.params.socket.value,
                 hardware: dataFactory(identifier, 'hardware')
@@ -391,36 +373,30 @@ var listSimpleStorage = controller(function(req, res)  {
     var identifier = req.swagger.params.identifier.value;
     var options = redfish.makeOptions(req, res, identifier);
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-//        if(/^[0-9|A-Z]{7}$/.test(node.name)){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-        if(dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
+            .then(function(hardware) {
+                options.hardware = hardware;
 
-                    var controllers = {};
-                    _.forEach(hardware.data.storage.controllers, function(ele) {
-                        var id = ele.fqdd.replace(/[:.]/g, '_');  // jshint ignore: line
-                        if(!(id in controllers)) {
-                            controllers[id] = [];
-                        }
-                        controllers[id].push(ele);
-                    });
+                var controllers = {};
+                _.forEach(hardware.data.storage.controllers, function(ele) {
+                    var id = ele.fQDD.replace(/[:.]/g, '_');  // jshint ignore: line
+                    if(!(id in controllers)) {
+                        controllers[id] = [];
+                    }
+                    controllers[id].push(ele);
+                });
 
-                    var ids = [];
-                    _.forOwn(controllers, function(val, key) { ids.push(key); });
-                    options.controllers = ids;
+                var ids = [];
+                _.forOwn(controllers, function(val, key) { ids.push(key); });
+                options.controllers = ids;
 
-                    return redfish.render('redfish.1.0.0.simplestoragecollection.json',
-                                    'SimpleStorageCollection.json#/definitions/SimpleStorageCollection',
-                                    options);
+                return redfish.render('redfish.1.0.0.simplestoragecollection.json',
+                                'SimpleStorageCollection.json#/definitions/SimpleStorageCollection',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
@@ -465,42 +441,34 @@ var getSimpleStorage = controller(function(req, res)  {
 
     options.index = index;
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-//        if(/^[0-9|A-Z]{7}$/.test(node.name)){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-        if(dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
-                    var controllers = {};
-                    _.forEach(hardware.data.storage.controllers, function(ele) {
-                        var id = ele.fqdd.replace(/[:.]/g, '_'); // jshint ignore: line
-                        if(!(id in controllers)) {
-                            controllers[id] = [];
-                        }
-                        controllers[id].push(ele);
-                    });
+            .then(function(hardware) {
+                options.hardware = hardware;
+                var controllers = {};
+                _.forEach(hardware.data.storage.controllers, function(ele) {
+                    var id = ele.fQDD.replace(/[:.]/g, '_'); // jshint ignore: line
+                    if(!(id in controllers)) {
+                        controllers[id] = [];
+                    }
+                    controllers[id].push(ele);
+                });
 
-                    options.controller = controllers[index][0];
-                    options.devices = [];
-//                    console.log("CONTROLLER: " + JSON.stringify(options.controller, null, 4));
-                    _.forEach(hardware.data.storage.physicalDisks, function(ele) {
-//                        console.log("DEVICE: " + JSON.stringify(ele, null, 4));
-                        if(ele.fqdd.indexOf(options.controller.fqdd) !== -1) {
-                            ele.size = ele.size.replace(/\B(?=(\d{3})+(?!\d))/g, ",") + " bytes";
-                            options.devices.push(ele);
-                        }
-                    });
+                options.controller = controllers[index][0];
+                options.devices = [];
+                _.forEach(hardware.data.storage.physicalDisks, function(ele) {
+                    if(ele.fqdd.indexOf(options.controller.fqdd) !== -1) {
+                        ele.size = ele.size.replace(/\B(?=(\d{3})+(?!\d))/g, ",") + " bytes";
+                        options.devices.push(ele);
+                    }
+                });
 
-                    return redfish.render('wsman.1.0.0.simplestorage.1.0.0.json',
-                                    'SimpleStorage.v1_1_1.json#/definitions/SimpleStorage',
-                                    options);
+                return redfish.render('wsman.1.0.0.simplestorage.1.0.0.json',
+                                'SimpleStorage.v1_1_1.json#/definitions/SimpleStorage',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
@@ -545,41 +513,36 @@ var listStorage = controller(function(req, res)  {
     var identifier = req.swagger.params.identifier.value;
     var options = redfish.makeOptions(req, res, identifier);
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound) {
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
+            .then(function(hardware) {
+                options.hardware = hardware;
 
-                    var controllers = {};
-                    _.forEach(hardware.data.storage.controllers, function(ele) {
-                        var id = ele.fQDD.replace(/[:.]/g, '_');  // jshint ignore: line
-                        if(!(id in controllers)) {
-                            controllers[id] = [];
-                        }
-                        controllers[id].push(ele);
-                    });
+                var controllers = {};
+                _.forEach(hardware.data.storage.controllers, function(ele) {
+                    var id = ele.fQDD.replace(/[:.]/g, '_');  // jshint ignore: line
+                    if(!(id in controllers)) {
+                        controllers[id] = [];
+                    }
+                    controllers[id].push(ele);
+                });
 
-                    var ids = [];
-                    _.forOwn(controllers, function(val, key) { ids.push(key); });
-                    options.controllers = ids;
+                var ids = [];
+                _.forOwn(controllers, function(val, key) { ids.push(key); });
+                options.controllers = ids;
 
-                    return redfish.render('redfish.2016.3.storagecollection.json',
-                                    'StorageCollection.json#/definitions/StorageCollection',
-                                    options);
+                return redfish.render('redfish.2016.3.storagecollection.json',
+                                'StorageCollection.json#/definitions/StorageCollection',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-       // } else {
-         //  throw "Not implemented for non-Dell hardware."
-       // }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -595,62 +558,54 @@ var getStorage = controller(function(req, res)  {
 
     options.index = index;
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound) {
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
-                    var controllers = {};
-                    _.forEach(hardware.data.storage.controllers, function(ele) {
-                        var id = ele.fQDD.replace(/[:.]/g, '_'); // jshint ignore: line
-                        if(!(id in controllers)) {
-                            controllers[id] = [];
+            .then(function(hardware) {
+                options.hardware = hardware;
+                var controllers = {};
+                _.forEach(hardware.data.storage.controllers, function(ele) {
+                    var id = ele.fQDD.replace(/[:.]/g, '_'); // jshint ignore: line
+                    if(!(id in controllers)) {
+                        controllers[id] = [];
+                    }
+                    controllers[id].push(ele);
+                });
+                options.controllers = [];
+                _.forEach(hardware.data.storage.controllers, function(ele) {
+                    var speed = ele.possibleSpeed; //possibleSpeed format is X_X_GBS or X_GBS, convert to decimal
+                    var speedInDecimal;
+                    if (speed){
+                        speed = speed.split('_');
+                        speed.splice(speed.length - 1, 1);
+                        speedInDecimal = speed[0];
+                        if (speed.length > 1){
+                            speedInDecimal += "." + speed[1];
                         }
-                        controllers[id].push(ele);
-                    });
-                    options.controllers = [];
-                    _.forEach(hardware.data.storage.controllers, function(ele) {
-                      var speed = ele.possibleSpeed; //possibleSpeed format is X_X_GBS or X_GBS, convert to decimal
-                      var speedInDecimal;
-                      if (speed){
-                          speed = speed.split('_');
-                          speed.splice(speed.length - 1, 1);
-                          speedInDecimal = speed[0];
-                          if (speed.length > 1){
-                              speedInDecimal += "." + speed[1];
-                          }
-                      }
-                      else {
-                          speedInDecimal = 0;
-                      }
-                      ele.possibleSpeed = speedInDecimal;
-                      //console.log("speedInGbs: " + speedInDecimal);
-                      options.controllers.push(ele);
-                    });
+                    }
+                    else {
+                        speedInDecimal = 0;
+                    }
+                    ele.possibleSpeed = speedInDecimal;
+                    options.controllers.push(ele);
+                });
 
-                    options.drives = [];
-//                    console.log("CONTROLLER: " + JSON.stringify(options.controller, null, 4));
-                    _.forEach(hardware.data.storage.physicalDisks, function(ele) {
-//                        console.log("DEVICE: " + JSON.stringify(ele, null, 4));
-                        //ele.size = ele.size.replace(/\B(?=(\d{3})+(?!\d))/g, ",") + " bytes";
-                        options.drives.push(ele);
-                    });
+                options.drives = [];
+                _.forEach(hardware.data.storage.physicalDisks, function(ele) {
+                    options.drives.push(ele);
+                });
 
-                    return redfish.render('redfish.2016.3.storage.1.1.1.json',
-                                    'Storage.v1_1_1.json#/definitions/Storage',
-                                    options);
+                return redfish.render('redfish.2016.3.storage.1.1.1.json',
+                                'Storage.v1_1_1.json#/definitions/Storage',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-       // } else { 
-       // }
+        } else { 
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -669,35 +624,31 @@ var getDrive = controller(function(req, res)  {
     options.identifier = identifier;
     options.index = index;
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound) {
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
-                    options.drive = hardware.data.storage.physicalDisks[driveIndex];
-                    options.volumeIds = [];
-                    //get redfish ids of all volumes related to this drive
-                    var currFqdd = hardware.data.storage.physicalDisks[driveIndex].fqdd;
-                    for(var i = 0; i < hardware.data.storage.virtualDisks.length; i++){
-                       if (hardware.data.storage.virtualDisks[i].physicalDiskIds.indexOf(currFqdd) > -1){
-                           options.volumeIds.push(i);
-                       } 
-                    }
-                    return redfish.render('redfish.2016.3.drive.1.1.1.json',
-                                    'Drive.v1_1_1.json#/definitions/Drive',
-                                    options);
+            .then(function(hardware) {
+                options.hardware = hardware;
+                options.drive = hardware.data.storage.physicalDisks[driveIndex];
+                options.volumeIds = [];
+                //get redfish ids of all volumes related to this drive
+                var currFqdd = hardware.data.storage.physicalDisks[driveIndex].fqdd;
+                for(var i = 0; i < hardware.data.storage.virtualDisks.length; i++){
+                    if (hardware.data.storage.virtualDisks[i].physicalDiskIds.indexOf(currFqdd) > -1){
+                        options.volumeIds.push(i);
+                    } 
+                }
+                return redfish.render('redfish.2016.3.drive.1.1.1.json',
+                                'Drive.v1_1_1.json#/definitions/Drive',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-      //  } else {
-      //  }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -708,31 +659,27 @@ var listVolume = controller(function(req, res)  {
     
     options.identifier = identifier;
     options.index = index;
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound) {
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
+            .then(function(hardware) {
+                options.hardware = hardware;
 
-                    options.virtualDisks = [];
-                    _.forEach(hardware.data.storage.virtualDisks, function(ele) {
-                        options.virtualDisks.push(ele);
-                    });
-                    return redfish.render('redfish.2016.3.volumecollection.json',
-                                    'VolumeCollection.json#/definitions/VolumeCollection',
-                                    options);
+                options.virtualDisks = [];
+                _.forEach(hardware.data.storage.virtualDisks, function(ele) {
+                    options.virtualDisks.push(ele);
+                });
+                return redfish.render('redfish.2016.3.volumecollection.json',
+                                'VolumeCollection.json#/definitions/VolumeCollection',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-       // } else {
-       // }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -751,38 +698,33 @@ var getVolume = controller(function(req, res)  {
     options.identifier = identifier;
     options.index = index;
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound) {
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
-                .then(function(hardware) {
-                    options.hardware = hardware;
-                    options.volume = hardware.data.storage.virtualDisks[volumeIndex];
-                    options.driveIds = [];
-                    //convert drive fqdds into the ids used for redfish
-                    _.forEach(hardware.data.storage.virtualDisks[volumeIndex].physicalDiskIds, function(ele){
-                        for(var i = 0; i < ele.length; i++){
-                            if (ele == hardware.data.storage.physicalDisks[i].fqdd){
-                                options.driveIds.push(i);
-                                //console.log(i);
-                                break;
-                            }
+            .then(function(hardware) {
+                options.hardware = hardware;
+                options.volume = hardware.data.storage.virtualDisks[volumeIndex];
+                options.driveIds = [];
+                //convert drive fqdds into the ids used for redfish
+                _.forEach(hardware.data.storage.virtualDisks[volumeIndex].physicalDiskIds, function(ele){
+                    for(var i = 0; i < ele.length; i++){
+                        if (ele == hardware.data.storage.physicalDisks[i].fqdd){
+                            options.driveIds.push(i);
+                            break;
                         }
-                    });
-                    return redfish.render('redfish.2016.3.volume.1.0.2.json',
-                                    'Volume.v1_0_2.json#/definitions/Volume',
-                                    options);
+                    }
+                });
+                return redfish.render('redfish.2016.3.volume.1.0.2.json',
+                                'Volume.v1_0_2.json#/definitions/Volume',
+                                options);
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-       // } else {
-       // }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -795,7 +737,7 @@ var listLogService = controller(function(req, res)  {
     var identifier = req.swagger.params.identifier.value;
     var options = redfish.makeOptions(req, res, identifier);
 
-    options.logSource = ['sel'];
+    options.logSource = ['sel', 'lc'];
     return redfish.render('redfish.1.0.0.logservicecollection.json',
                  'LogServiceCollection.json#/definitions/LogServiceCollection',
                   options)
@@ -813,23 +755,47 @@ var getSelLogService = controller(function(req, res)  {
     var identifier = req.swagger.params.identifier.value;
     var options = redfish.makeOptions(req, res, identifier);
 
-    options.type = 'SEL';
-    options.description = 'IPMI System Event Log';
-    options.name = 'ipmi-sel-information';
-    options.log = {};
-
-    return dataFactory(identifier, 'selInfoData')
-        .then(function(sel) {
-            options.log.size = sel['# of Alloc Units'] || 0;
-            options.log.policy = sel.Overflow && sel.Overflow === 'false' ?
-                'WrapsWhenFull' :
-                'NeverOverWrites';
-            options.log.lastWriteDate = sel['Last Add Time'] || 'Unknown';
-            return redfish.render('redfish.1.0.0.logservice.1.0.0.json',
-                            'LogService.v1_0_3.json#/definitions/LogService',
-                            options);
-    }).catch(function(error) {
-        return redfish.handleError(error, res);
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
+            options.type = 'SEL';
+            options.description = 'iDRAC System Event Log';
+            options.name = 'idrac-sel-information';
+            options.log = {};
+            return wsman.getLog(node, options.type)
+            .then(function(sel) {
+                options.log.size = sel.length || 0;
+                options.log.policy = sel.Overflow && sel.Overflow === 'false' ?
+                    'WrapsWhenFull' :
+                    'NeverOverWrites';
+                options.log.lastWriteDate = sel.creationTimeStamp || 'Unknown';
+                return redfish.render('redfish.1.0.0.logservice.1.0.0.json',
+                                'LogService.v1_0_3.json#/definitions/LogService',
+                                options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        } else {
+            options.type = 'SEL';
+            options.description = 'IPMI System Event Log';
+            options.name = 'ipmi-sel-information';
+            options.log = {};
+
+            return dataFactory(identifier, 'selInfoData')
+                .then(function(sel) {
+                    options.log.size = sel['# of Alloc Units'] || 0;
+                    options.log.policy = sel.Overflow && sel.Overflow === 'false' ?
+                        'WrapsWhenFull' :
+                        'NeverOverWrites';
+                    options.log.lastWriteDate = sel['Last Add Time'] || 'Unknown';
+                    return redfish.render('redfish.1.0.0.logservice.1.0.0.json',
+                                    'LogService.v1_0_3.json#/definitions/LogService',
+                                    options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        }
     });
 });
 
@@ -844,20 +810,36 @@ var listSelLogServiceEntries = controller(function(req, res)  {
 
     options.type = 'SEL';
 
-    return dataFactory(identifier, 'selData')
-    .then(function(selData) {
-        if(selData) {
-            return selTranslator(selData, identifier);
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
+            return wsman.getLog(node, options.type)
+            .then(function(selData) {
+                options.logEntries = selData;
+                return redfish.render('wsman.1.0.0.logentrycollection.json',
+                                'LogEntryCollection.json#/definitions/LogEntryCollection',
+                                options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        } else {
+            return dataFactory(identifier, 'selData')
+            .then(function(selData) {
+                if(selData) {
+                    return selTranslator(selData, identifier);
+                }
+                return [];
+            })
+            .then(function(selData) {
+                options.logEntries = selData;
+                return redfish.render('redfish.1.0.0.logentrycollection.json',
+                                'LogEntryCollection.json#/definitions/LogEntryCollection',
+                                options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
         }
-        return [];
-    })
-    .then(function(selData) {
-        options.logEntries = selData;
-        return redfish.render('redfish.1.0.0.logentrycollection.json',
-                        'LogEntryCollection.json#/definitions/LogEntryCollection',
-                        options);
-    }).catch(function(error) {
-        return redfish.handleError(error, res);
     });
 });
 
@@ -876,24 +858,153 @@ var getSelLogServiceEntry = controller(function(req, res)  {
     options.name = 'ipmi-sel-information';
     options.log = {};
 
-    return dataFactory(identifier, 'selData')
-    .then(function(selData) {
-        options.entries = _.filter(selData, function(entry) {
-            return entry.logId === entryId;
-        });
-        if(!options.entries.length) {
-            throw new Errors.NotFoundError('sel entry ' + entryId + ' was not found');
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
+            return wsman.getLog(node, options.type)
+            .then(function(selData) {
+                options.entries = _.filter(selData, function(entry) {
+                    return entry.recordID === entryId;
+                });
+                if(!options.entries.length) {
+                    throw new Errors.NotFoundError('sel entry ' + entryId + ' was not found');
+                }
+                options.entry = options.entries[0];
+                return redfish.render('wsman.1.0.0.logentry.1.0.0.json',
+                            'LogEntry.v1_1_1.json#/definitions/LogEntry',
+                            options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        } else {
+            return dataFactory(identifier, 'selData')
+            .then(function(selData) {
+                options.entries = _.filter(selData, function(entry) {
+                    return entry.logId === entryId;
+                });
+                if(!options.entries.length) {
+                    throw new Errors.NotFoundError('SEL entry ' + entryId + ' was not found');
+                }
+                return selTranslator(options.entries, identifier);
+            })
+            .then(function(selData) {
+                options.entries = selData;
+                options.entry = options.entries[0];
+                return redfish.render('redfish.1.0.0.logentry.1.0.0.json',
+                                'LogEntry.v1_1_1.json#/definitions/LogEntry',
+                                options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        }
+    });
+});
+
+/**
+ * Generate information about the log service provider for a system
+ * @param  {Object}     req
+ * @param  {Object}     res
+ */
+var getLcLogService = controller(function(req, res)  {
+    var identifier = req.swagger.params.identifier.value;
+    var options = redfish.makeOptions(req, res, identifier);
+
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
+            options.type = 'LC';
+            options.description = 'iDRAC Lifecycle Controller Log';
+            options.name = 'idrac-lc-information';
+            options.log = {};
+            return wsman.getLog(node, options.type)
+            .then(function(lc) {
+                options.log.size = lc.length || 0;
+                options.log.policy = lc.Overflow && lc.Overflow === 'false' ?
+                    'WrapsWhenFull' :
+                    'NeverOverWrites';
+                options.log.lastWriteDate = lc.creationTimeStamp || 'Unknown';
+                return redfish.render('redfish.1.0.0.logservice.1.0.0.json',
+                                'LogService.v1_0_3.json#/definitions/LogService',
+                                options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
+    });
+});
+
+/**
+ * Generate information about the log entries of a log service for a system
+ * @param  {Object}     req
+ * @param  {Object}     res
+ */
+var listLcLogServiceEntries = controller(function(req, res)  {
+    var identifier = req.swagger.params.identifier.value;
+    var options = redfish.makeOptions(req, res, identifier);
+
+    options.type = 'LC';
+
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
+            return wsman.getLog(node, options.type)
+            .then(function(lcData) {
+                options.logEntries = lcData;
+                return redfish.render('wsman.1.0.0.lclogentrycollection.json',
+                                'LogEntryCollection.json#/definitions/LogEntryCollection',
+                                options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
+    });
+});
+
+/**
+ * Generate information about a specific log entry for a system
+ * @param  {Object}     req
+ * @param  {Object}     res
+ */
+var getLcLogServiceEntry = controller(function(req, res)  {
+    var identifier = req.swagger.params.identifier.value;
+    var entryId = req.swagger.params.entryId.value;
+    var options = redfish.makeOptions(req, res, identifier);
+
+    options.type = 'LC';
+    options.description = 'Lifecycle Controller Log';
+    options.name = 'wsman-lc-information';
+    options.log = {};
+
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
+            return wsman.getLog(node, options.type)
+            .then(function(lcData) {
+                var id = parseInt(entryId);
+                options.entries = _.filter(lcData, function(entry) {
+                    return entry.recordId === id;
+                });
+                if(!options.entries.length) {
+                    throw new Errors.NotFoundError('LC entry ' + entryId + ' was not found');
+                }
+                options.entry = options.entries[0];
+                return redfish.render('wsman.1.0.0.lclogentry.1.0.0.json',
+                            'LogEntry.v1_1_1.json#/definitions/LogEntry',
+                            options);
+            }).catch(function(error) {
+                return redfish.handleError(error, res);
+            });
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
         }
-        return selTranslator(options.entries, identifier);
-    })
-    .then(function(selData) {
-        options.entries = selData;
-        options.entry = options.entries[0];
-        return redfish.render('redfish.1.0.0.logentry.1.0.0.json',
-                        'LogEntry.v1_1_1.json#/definitions/LogEntry',
-                        options);
-    }).catch(function(error) {
-        return redfish.handleError(error, res);
     });
 });
 
@@ -1045,31 +1156,22 @@ var deleteVolume = controller(function(req,res) {
     var options = redfish.makeOptions(req, res, identifier);
     var volumeIndex = req.swagger.params.volumeIndex.value;
     var payload = req.swagger.params.payload.value;
-    console.log("username: " + payload.username + " password: " + payload.password);
-    //var logger = Logger.initialize(deleteVolume);
-    console.log("reached delete volume method");
     
     var graphName = 'Graph.Delete.Volume';
     var graphOptions = {
         defaults: payload
     };
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
             .then(function(hardware) {
                 if(!dellFound){throw "Delete volume not implemented for non-Dell hardware";}
                 graphOptions.defaults.volumeId = hardware.data.storage.virtualDisks[volumeIndex].fqdd;
                 graphOptions.defaults.ipAddress = hardware.data.id;
-                console.log(hardware.data.id);
             }).then(function(){
-                 return nodeApi.setNodeWorkflowById({ name: graphName, options: graphOptions }, identifier);
+                return nodeApi.setNodeWorkflowById({ name: graphName, options: graphOptions }, identifier);
             }).then(function reportTask(data) {
                 return {
                     '@odata.id': options.basepath + '/TaskService/Tasks/' + data.instanceId
@@ -1080,8 +1182,9 @@ var deleteVolume = controller(function(req,res) {
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-
-       // }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -1089,9 +1192,6 @@ var addVolume = controller(function(req,res) {
     var identifier = req.swagger.params.identifier.value;   
     var options = redfish.makeOptions(req, res, identifier);
     var payload = req.swagger.params.payload.value;
-    console.log("username: " + payload.username + " password: " + payload.password);
-    //var logger = Logger.initialize(addVolume);
-    console.log("reached add volume method");
    
     var graphName = 'Graph.Add.Volume';
     var graphOptions = {
@@ -1101,66 +1201,59 @@ var addVolume = controller(function(req,res) {
         }
     };
 
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
             .then(function(hardware) {
                 if (!dellFound){throw "Add Volume not implemented for non-Dell hardware.";} 
-            	var driveIndices = [];
-            	for(i = 0; i < payload.volume.Links.Drives.length; i++)
-            	{
-                        var odataId = payload.volume.Links.Drives[i]['@odata.id'].split('/');
-            		var ind = odataId[odataId.length - 1];
-                        console.log("using drive with id " + ind);
-            		console.log(payload.volume.Links.Drives[i]['@odata.id']);
-                        driveIndices.push(ind);
-            	}
-		if (driveIndices.length === 0){ throw "No Drives specified for the Volume to use.";}
-            	graphOptions.defaults.ipAddress = hardware.data.id;
+                var driveIndices = [];
+                for(i = 0; i < payload.volume.Links.Drives.length; i++)
+                {
+                    var odataId = payload.volume.Links.Drives[i]['@odata.id'].split('/');
+                    var ind = odataId[odataId.length - 1];
+                    driveIndices.push(ind);
+                }
+                if (driveIndices.length === 0){ throw "No Drives specified for the Volume to use.";}
+                graphOptions.defaults.ipAddress = hardware.data.id;
                 graphOptions.defaults.name = payload.volume.Name;
                 if (graphOptions.defaults.name.indexOf(" ") !== -1){ throw "Virtual disk name cannot have spaces";}
                 graphOptions.defaults.sizeInBytes = payload.volume.CapacityBytes;
-            	graphOptions.defaults.drives = "";
-            	for(i = 0; i < driveIndices.length; i++)
-            	{
+                graphOptions.defaults.drives = "";
+                for(i = 0; i < driveIndices.length; i++)
+                {
                         if (driveIndices[i] >= hardware.data.storage.physicalDisks.length){
                             throw "No drive exists with id " + driveIndices[i]; 
                         }
-            		graphOptions.defaults.drives += hardware.data.storage.physicalDisks[driveIndices[i]].fqdd;
+                    graphOptions.defaults.drives += hardware.data.storage.physicalDisks[driveIndices[i]].fqdd;
                         if (i+1 < driveIndices.length){
                             graphOptions.defaults.drives += ',';
                         }
-            	}
-            	var raidLevel = payload.volume.VolumeType;
-            	switch(raidLevel)
-            	{
-				    case "NonRedundant":
-				    	graphOptions.defaults.raidLevel = 'r0';
-				    	break;
-				    case "Mirrored":
-				    	graphOptions.defaults.raidLevel = 'r1';
-				    	break;
-				    case "StripedWithParity":
-				    	graphOptions.defaults.raidLevel = 'r5';
-				    	break;
-				    case "SpannedMirrors":
-				    	graphOptions.defaults.raidLevel = 'r10';
-				    	break;
-				    case "SpannedStripesWithParity":
-				    	graphOptions.defaults.raidLevel = 'r50';
-				    	break;
-				    default:
-				    	throw "Invalid Raid Level for creating volume";
-            	}
+                }
+                var raidLevel = payload.volume.VolumeType;
+                switch(raidLevel)
+                {
+                    case "NonRedundant":
+                        graphOptions.defaults.raidLevel = 'r0';
+                        break;
+                    case "Mirrored":
+                        graphOptions.defaults.raidLevel = 'r1';
+                        break;
+                    case "StripedWithParity":
+                        graphOptions.defaults.raidLevel = 'r5';
+                        break;
+                    case "SpannedMirrors":
+                        graphOptions.defaults.raidLevel = 'r10';
+                        break;
+                    case "SpannedStripesWithParity":
+                        graphOptions.defaults.raidLevel = 'r50';
+                        break;
+                    default:
+                        throw "Invalid Raid Level for creating volume";
+                }
             }).then(function(){
-                 return nodeApi.setNodeWorkflowById({ name: graphName, options: graphOptions }, identifier);
+                return nodeApi.setNodeWorkflowById({ name: graphName, options: graphOptions }, identifier);
             }).then(function reportTask(data) {
                 return {
                     '@odata.id': options.basepath + '/TaskService/Tasks/' + data.instanceId
@@ -1171,8 +1264,9 @@ var addVolume = controller(function(req,res) {
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-
-       // }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -1181,7 +1275,6 @@ var addHotspare = controller(function(req,res) {
     var options = redfish.makeOptions(req, res, identifier);
     var driveIndex = req.swagger.params.driveIndex.value;
     var payload = req.swagger.params.payload.value;
-    console.log(" type: " + payload.hotspareType);
     /*
     payload looks like for dhs:
     {
@@ -1191,29 +1284,14 @@ var addHotspare = controller(function(req,res) {
 
     }
     */
-    if(payload.hotspareType == 'dhs'){
-        console.log("username: " + payload.username + " password: " + payload.password + " volumeId " + payload.volumeId);
-
-    }
-    else{
-        console.log("username: " + payload.username + " password: " + payload.password);
-
-    }
-    console.log("reached add hotspare method");
-    
     var graphName = 'Graph.Add.Hotspare';
     var graphOptions = {
         defaults: payload
     };
-    return waterline.nodes.getNodeById(identifier)
-    .then(function(node){
-        var dellFound = false;
-        for(var i=0; i<node.identifiers.length; i++)
-            if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
-                dellFound = true;
-                break;
-            }
-       // if (dellFound){
+    return wsman.isDellSystem(identifier)
+    .then(function(result){
+        var node = result.node;
+        if(result.isDell){
             return Promise.resolve(dataFactory(identifier, 'hardware'))
             .then(function(hardware) {
                 if(!dellFound){throw "Add hotspare not implemented for non-Dell hardware";}
@@ -1229,7 +1307,7 @@ var addHotspare = controller(function(req,res) {
                     graphOptions.defaults.volumeId = hardware.data.storage.virtualDisks[volumeIndex].fqdd;
                 }
             }).then(function(){
-                 return nodeApi.setNodeWorkflowById({ name: graphName, options: graphOptions }, identifier);
+                return nodeApi.setNodeWorkflowById({ name: graphName, options: graphOptions }, identifier);
             }).then(function reportTask(data) {
                 return {
                     '@odata.id': options.basepath + '/TaskService/Tasks/' + data.instanceId
@@ -1240,8 +1318,9 @@ var addHotspare = controller(function(req,res) {
             }).catch(function(error) {
                 return redfish.handleError(error, res);
             });
-
-       // }
+        } else {
+            return redfish.handleError(new Error("Not implemented for non-Dell hardware.", res));
+        }
     });
 });
 
@@ -1318,6 +1397,9 @@ module.exports = {
     getSelLogService: getSelLogService,
     listSelLogServiceEntries: listSelLogServiceEntries,
     getSelLogServiceEntry: getSelLogServiceEntry,
+    getLcLogService: getLcLogService,
+    listLcLogServiceEntries: listLcLogServiceEntries,
+    getLcLogServiceEntry: getLcLogServiceEntry,
     listResetTypes: listResetTypes,
     doReset: doReset,
     listBootImage: listBootImage,
diff --git a/lib/services/wsman-service.js b/lib/services/wsman-service.js
new file mode 100644
index 000000000..7c825cef8
--- /dev/null
+++ b/lib/services/wsman-service.js
@@ -0,0 +1,109 @@
+// Copyright © 2017 Dell Inc. or its subsidiaries. All Rights Reserved.
+
+'use strict';
+
+var di = require('di');
+var ejs = require('ejs');
+var urlParse = require('url-parse');
+
+module.exports = wsmanServiceFactory;
+di.annotate(wsmanServiceFactory, new di.Provide('Http.Services.Wsman'));
+di.annotate(wsmanServiceFactory,
+    new di.Inject(
+        'Services.Waterline',
+        'Services.Encryption',
+        'Services.Configuration',
+        'JobUtils.WsmanTool'
+    )
+);
+function wsmanServiceFactory(
+    waterline,
+    encryption,
+    configuration,
+    WsmanTool
+) {
+
+    //var logger = Logger.initialize(wsmanServiceFactory);
+
+    function WsmanService() {
+        this.dellConfigs = null;
+    }
+
+    WsmanService.prototype.init = function (node) {
+    	var self = this;
+        return waterline.obms.findByNode(node.id, 'dell-wsman-obm-service', true)
+        .then(function(obm) {
+            if (!obm) { throw new errors.NotFoundError('Failed to find Wsman obm settings'); }
+            self.dellConfigs = configuration.get('dell');
+            if (!self.dellConfigs) {
+            	throw new errors.NotFoundError('Configuration for WSMan web services is not defined in wsmanConfig.json.');
+            }
+            var parse = urlParse(self.dellConfigs.gateway);
+            
+            var protocol = parse.protocol.replace(':','').trim();
+            self.settings = {
+                uri: parse.href,
+                host: parse.host.split(':')[0],
+                root: parse.pathname,
+                port: parse.port,
+                protocol: protocol,
+                verifySSL: false,
+                recvTimeoutMs: 30000
+            };
+            self.wsman = new WsmanTool();
+            self.wsman.settings = self.settings;
+            
+            self.target = {
+                address: obm.config.host,
+                userName: obm.config.userName,
+                password: encryption.decrypt(obm.config.password)
+            }
+        });
+    };
+
+
+    WsmanService.prototype.getLog = function(node, logType) {
+        var self = this;
+
+        return self.init(node)
+        .then(function(){
+            if (!self.dellConfigs.services.inventory.logs) {
+            	throw new errors.NotFoundError('Dell Configuration (INVENTORY.LOGS) web service is not defined in wsmanConfig.json.');
+            }
+            var url = self.dellConfigs.services.inventory.logs;
+            url = url.replace(/{type}/, logType.toUpperCase());
+
+            return self.wsman.clientRequest(url, 'POST', self.target)
+            .then(function(response) {
+                //logger.debug(JSON.stringify(response.body));
+                return response.body;
+            })
+        })
+    }
+
+
+     WsmanService.prototype.isDellSystem = function(identifier) {
+        var result = {node: undefined, isDell: false, isRedfishCapable: false};
+        return waterline.nodes.getNodeById(identifier)
+        .then(function(node){
+            result.node = node;
+            for(var i=0; i<node.identifiers.length; i++) {
+                if(/^[0-9|A-Z]{7}$/.test(node.identifiers[i])){
+                    result.isDell = true;
+                    break;
+                }
+            }
+            return node;        
+        }).then(function(node){
+            return waterline.obms.findByNode(node.id, 'redfish-obm-service', true)
+            .then(function (obmSetting) {
+                if(obmSetting){
+                    result.isRedfishCapable = false;  // Change to true to enable southbound redfish
+                }
+                return result;
+            })
+        });
+    }
+
+    return new WsmanService();
+}
diff --git a/static/redfish.yaml b/static/redfish.yaml
index 69ae3f25c..29a574059 100755
--- a/static/redfish.yaml
+++ b/static/redfish.yaml
@@ -828,6 +828,111 @@ paths:
           description: Error
           schema:
             $ref: "#/definitions/ErrorResponse"
+  /Systems/{identifier}/LogServices/lc:
+    x-swagger-router-controller: systems
+    get:
+      x-privileges: [ 'Login' ]
+      x-authentication-type: [ 'redfish', 'basic' ]
+      summary: retrieve list of the logs for a computer system
+      description: >
+        Defines a collection of SEL entries for the system described by
+        identifier.
+      operationId: getLcLogService
+      tags: [ "/redfish/v1" ]
+      parameters:
+        - name: identifier
+          in: path
+          required: true
+          type: string
+          x-param-handler: sku
+      responses:
+        200:
+          description: Success
+          schema:
+            $ref: "#/definitions/LogService.1.0.0_LogService"
+        400:
+          $ref: "#/responses/status_400"
+        401:
+          $ref: "#/responses/status_401"
+        403:
+          $ref: "#/responses/status_403"
+        404:
+          $ref: "#/responses/status_404"
+        500:
+          description: Error
+          schema:
+            $ref: "#/definitions/ErrorResponse"
+  /Systems/{identifier}/LogServices/lc/Entries:
+    x-swagger-router-controller: systems
+    get:
+      x-privileges: [ 'Login' ]
+      x-authentication-type: [ 'redfish', 'basic' ]
+      summary: retrieve list of the logs entries for associated for log service
+      description: >
+        Defines a collection of entries for the system described by identifier
+      operationId: listLcLogServiceEntries
+      tags: [ "/redfish/v1" ]
+      parameters:
+        - name: identifier
+          in: path
+          required: true
+          type: string
+          x-param-handler: sku
+      responses:
+        200:
+          description: Success
+          schema:
+            $ref: "#/definitions/LogEntryCollection_LogEntryCollection"
+        400:
+          $ref: "#/responses/status_400"
+        401:
+          $ref: "#/responses/status_401"
+        403:
+          $ref: "#/responses/status_403"
+        404:
+          $ref: "#/responses/status_404"
+        500:
+          description: Error
+          schema:
+            $ref: "#/definitions/ErrorResponse"
+  /Systems/{identifier}/LogServices/lc/Entries/{entryId}:
+    x-swagger-router-controller: systems
+    get:
+      x-privileges: [ 'Login' ]
+      x-authentication-type: [ 'redfish', 'basic' ]
+      summary: retrieve log entry by logId associated for log service
+      description: >
+        Defines a log entry specified by entryId within the LogService of the
+        specified type for the system described by identifier
+      operationId: getLcLogServiceEntry
+      tags: [ "/redfish/v1" ]
+      parameters:
+        - name: identifier
+          in: path
+          required: true
+          type: string
+          x-param-handler: sku
+        - name: entryId
+          in: path
+          required: true
+          type: string
+      responses:
+        200:
+          description: Success
+          schema:
+            $ref: "#/definitions/LogEntry.1.0.0_LogEntry"
+        400:
+          $ref: "#/responses/status_400"
+        401:
+          $ref: "#/responses/status_401"
+        403:
+          $ref: "#/responses/status_403"
+        404:
+          $ref: "#/responses/status_404"
+        500:
+          description: Error
+          schema:
+            $ref: "#/definitions/ErrorResponse"
   /Systems/{identifier}/Actions/ComputerSystem.Reset:
     x-swagger-router-controller: systems
     get: