diff --git a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/ClientSessionSubscriptionEndpoint.java b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/ClientSessionSubscriptionEndpoint.java
index 65fbea12cc..6fd1d99705 100644
--- a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/ClientSessionSubscriptionEndpoint.java
+++ b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/ClientSessionSubscriptionEndpoint.java
@@ -73,7 +73,6 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
      * @param session    - Registered  session.
      * @param deviceType - DeviceType
      * @param deviceId   - Device Identifier
-     * @param message    - Status code for web-socket close.
      */
     @OnMessage
     public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam
@@ -87,7 +86,7 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
      * @param session    - Registered  session.
      * @param deviceType - DeviceType
      * @param deviceId   - Device Identifier
-     * @param message    - Message which needs to send to peer
+     * @param message    - Byte message which needs to send to peer
      */
     @OnMessage
     public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam
@@ -96,7 +95,7 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
     }
 
     /**
-     * Web socket onClose - Handle socket connection close
+     * Web socket onClose use to handle  socket connection close
      *
      * @param session    - Registered  session.
      * @param deviceType - DeviceType
@@ -110,12 +109,12 @@ public class ClientSessionSubscriptionEndpoint extends SubscriptionEndpoint {
     }
 
     /**
-     * Web socket onError - Handle socket connection error
+     * Web socket onError use to handle  socket connection error
      *
      * @param session    - Registered  session.
+     * @param throwable  - Web socket exception
      * @param deviceType - DeviceType
      * @param deviceId   - Device Identifier
-     * @param throwable  - Status code for web-socket close.
      */
     @OnError
     public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam
diff --git a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/DeviceSessionSubscriptionEndpoint.java b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/DeviceSessionSubscriptionEndpoint.java
index 405b74bda4..de504eacfd 100644
--- a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/DeviceSessionSubscriptionEndpoint.java
+++ b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/DeviceSessionSubscriptionEndpoint.java
@@ -72,7 +72,7 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
      * Web socket onMessage use when device sends a string message
      *
      * @param session    - Registered  session.
-     * @param message    - Status code for web-socket close.
+     * @param message    - String message  which needs to send to peer
      * @param deviceType - DeviceType
      * @param deviceId   - Device Identifier
      */
@@ -86,10 +86,9 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
      * Web socket onMessage use when device sends a byte message
      *
      * @param session    - Registered  session.
-     * @param message    - Status code for web-socket close.
+     * @param message    - Byte message  which needs to send to peer
      * @param deviceType - DeviceType
      * @param deviceId   - Device Identifier
-     * @param message    - Message which needs to send to peer
      */
     @OnMessage
     public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam
@@ -98,7 +97,7 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
     }
 
     /**
-     * Web socket onClose - Handle socket connection close
+     * Web socket onClose use to handle  socket connection close
      *
      * @param session    - Registered  session.
      * @param deviceType - DeviceType
@@ -112,12 +111,12 @@ public class DeviceSessionSubscriptionEndpoint extends SubscriptionEndpoint {
     }
 
     /**
-     * Web socket onError - Handle socket connection error
+     * Web socket onError use to handle  socket connection error
      *
      * @param session    - Registered  session.
+     * @param throwable  - Web socket exception
      * @param deviceType - DeviceType
      * @param deviceId   - Device Identifier
-     * @param throwable  - Status code for web-socket close.
      */
     @OnError
     public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam
diff --git a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/SubscriptionEndpoint.java b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/SubscriptionEndpoint.java
index 706af8bf29..f3ed4cd305 100644
--- a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/SubscriptionEndpoint.java
+++ b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/src/main/java/org/wso2/carbon/device/mgt/extensions/remote/session/endpoint/SubscriptionEndpoint.java
@@ -38,10 +38,9 @@ public class SubscriptionEndpoint {
     /**
      * Web socket onMessage - When client sends a message
      *
-     * @param session   - Registered  session.
+     * @param session    - Registered  session.
      * @param deviceType - DeviceType
-     * @param deviceId - Device Identifier
-     * @param message - Status code for web-socket close.
+     * @param message    - String Message which needs to send to peer
      */
     public void onMessage(Session session, String message, @PathParam("deviceType") String deviceType, @PathParam
             ("deviceId") String deviceId) {
@@ -68,10 +67,10 @@ public class SubscriptionEndpoint {
     /**
      * Web socket onMessage use When client sends a message
      *
-     * @param session   - Registered  session.
+     * @param session    - Registered  session.
      * @param deviceType - DeviceType
-     * @param deviceId - Device Identifier
-     * @param message - Message which needs to send to peer
+     * @param deviceId   - Device Identifier
+     * @param message    - Byte Message which needs to send to peer
      */
     public void onMessage(Session session, byte[] message, @PathParam("deviceType") String deviceType, @PathParam
             ("deviceId") String deviceId) {
@@ -96,12 +95,12 @@ public class SubscriptionEndpoint {
     }
 
     /**
-     * Web socket onClose - Handle socket connection close
+     * Web socket onClose use to handle  socket connection close
      *
-     * @param session   - Registered  session.
+     * @param session    - Registered  session.
      * @param deviceType - DeviceType
-     * @param deviceId - Device Identifier
-     * @param reason  - Status code for web-socket close.
+     * @param deviceId   - Device Identifier
+     * @param reason     - Status code for web-socket close.
      */
     public void onClose(Session session, CloseReason reason, @PathParam("deviceType") String deviceType, @PathParam
             ("deviceId") String deviceId) {
@@ -116,12 +115,12 @@ public class SubscriptionEndpoint {
     }
 
     /**
-     * Web socket onError - Handle socket connection error
+     * Web socket onError use to handle  socket connection error
      *
-     * @param session   - Registered  session.
+     * @param session    - Registered  session.
+     * @param throwable  - Web socket exception
      * @param deviceType - DeviceType
-     * @param deviceId - Device Identifier
-     * @param throwable - Status code for web-socket close.
+     * @param deviceId   - Device Identifier
      */
     public void onError(Session session, Throwable throwable, @PathParam("deviceType") String deviceType, @PathParam
             ("deviceId") String deviceId) {
diff --git a/components/extensions/remote-session-extension/pom.xml b/components/extensions/remote-session-extension/pom.xml
index ccecd1b6d3..61d3b27c16 100644
--- a/components/extensions/remote-session-extension/pom.xml
+++ b/components/extensions/remote-session-extension/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ WSO2 Inc. licenses this file to you under the Apache License,
 ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml
index c33b0ae79c..ca657b908e 100644
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/src/main/resources/build.properties b/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/src/main/resources/build.properties
index 33bb0980d3..e0fe0c5134 100644
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/src/main/resources/build.properties
+++ b/features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/src/main/resources/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 #
 # WSO2 Inc. licenses this file to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file except