diff --git a/openvidu-node-client/docs/enums/openvidurole.html b/openvidu-node-client/docs/enums/openvidurole.html
index b80d3600..6ec853de 100644
--- a/openvidu-node-client/docs/enums/openvidurole.html
+++ b/openvidu-node-client/docs/enums/openvidurole.html
@@ -90,12 +90,13 @@
 					<div class="tsd-signature tsd-kind-icon">MODERATOR<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =&nbsp;&quot;MODERATOR&quot;</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in <a href="https://github.com/OpenVidu/openvidu/tree/master/openvidu-node-client/src/OpenViduRole.ts#L33">OpenViduRole.ts:33</a></li>
+							<li>Defined in <a href="https://github.com/OpenVidu/openvidu/tree/master/openvidu-node-client/src/OpenViduRole.ts#L34">OpenViduRole.ts:34</a></li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p><em>(not available yet)</em> SUBSCRIBER + PUBLIHSER permissions + can force <code>unpublish()</code> and <code>disconnect()</code> over a third-party stream or user</p>
+							<p>SUBSCRIBER + PUBLISHER permissions + can force the unpublishing or disconnection over a third-party Stream or Connection
+							(call <code>Session.forceUnpublish()</code> and <code>Session.forceDisconnect()</code>)</p>
 						</div>
 					</div>
 				</section>
@@ -110,7 +111,7 @@
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>SUBSCRIBER permissions + can publish their own streams</p>
+							<p>SUBSCRIBER permissions + can publish their own Streams (call <code>Session.publish()</code>)</p>
 						</div>
 					</div>
 				</section>
@@ -125,7 +126,7 @@
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>Can subscribe to published streams of other users</p>
+							<p>Can subscribe to published Streams of other users</p>
 						</div>
 					</div>
 				</section>
diff --git a/openvidu-node-client/docs/interfaces/tokenoptions.html b/openvidu-node-client/docs/interfaces/tokenoptions.html
index 0c3a6d14..12ffaf8a 100644
--- a/openvidu-node-client/docs/interfaces/tokenoptions.html
+++ b/openvidu-node-client/docs/interfaces/tokenoptions.html
@@ -93,7 +93,7 @@
 				<h2>Properties</h2>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="data" class="tsd-anchor"></a>
-					<h3>data</h3>
+					<h3><span class="tsd-flag ts-flagOptional">Optional</span> data</h3>
 					<div class="tsd-signature tsd-kind-icon">data<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 						<ul>
@@ -113,7 +113,7 @@
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="role" class="tsd-anchor"></a>
-					<h3>role</h3>
+					<h3><span class="tsd-flag ts-flagOptional">Optional</span> role</h3>
 					<div class="tsd-signature tsd-kind-icon">role<span class="tsd-signature-symbol">:</span> <a href="../enums/openvidurole.html" class="tsd-signature-type">OpenViduRole</a></div>
 					<aside class="tsd-sources">
 						<ul>
diff --git a/openvidu-node-client/lib/OpenViduRole.d.ts b/openvidu-node-client/lib/OpenViduRole.d.ts
index 6c534e64..958f6b39 100644
--- a/openvidu-node-client/lib/OpenViduRole.d.ts
+++ b/openvidu-node-client/lib/OpenViduRole.d.ts
@@ -1,14 +1,15 @@
 export declare enum OpenViduRole {
     /**
-     * Can subscribe to published streams of other users
+     * Can subscribe to published Streams of other users
      */
     SUBSCRIBER = "SUBSCRIBER",
     /**
-     * SUBSCRIBER permissions + can publish their own streams
+     * SUBSCRIBER permissions + can publish their own Streams (call `Session.publish()`)
      */
     PUBLISHER = "PUBLISHER",
     /**
-     * _(not available yet)_ SUBSCRIBER + PUBLIHSER permissions + can force `unpublish()` and `disconnect()` over a third-party stream or user
+     * SUBSCRIBER + PUBLISHER permissions + can force the unpublishing or disconnection over a third-party Stream or Connection
+     * (call `Session.forceUnpublish()` and `Session.forceDisconnect()`)
      */
     MODERATOR = "MODERATOR"
 }
diff --git a/openvidu-node-client/lib/OpenViduRole.js b/openvidu-node-client/lib/OpenViduRole.js
index 79ea08a4..bdfbd152 100644
--- a/openvidu-node-client/lib/OpenViduRole.js
+++ b/openvidu-node-client/lib/OpenViduRole.js
@@ -19,15 +19,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var OpenViduRole;
 (function (OpenViduRole) {
     /**
-     * Can subscribe to published streams of other users
+     * Can subscribe to published Streams of other users
      */
     OpenViduRole["SUBSCRIBER"] = "SUBSCRIBER";
     /**
-     * SUBSCRIBER permissions + can publish their own streams
+     * SUBSCRIBER permissions + can publish their own Streams (call `Session.publish()`)
      */
     OpenViduRole["PUBLISHER"] = "PUBLISHER";
     /**
-     * _(not available yet)_ SUBSCRIBER + PUBLIHSER permissions + can force `unpublish()` and `disconnect()` over a third-party stream or user
+     * SUBSCRIBER + PUBLISHER permissions + can force the unpublishing or disconnection over a third-party Stream or Connection
+     * (call `Session.forceUnpublish()` and `Session.forceDisconnect()`)
      */
     OpenViduRole["MODERATOR"] = "MODERATOR";
 })(OpenViduRole = exports.OpenViduRole || (exports.OpenViduRole = {}));
diff --git a/openvidu-node-client/lib/OpenViduRole.js.map b/openvidu-node-client/lib/OpenViduRole.js.map
index fa4ca76c..75fa9547 100644
--- a/openvidu-node-client/lib/OpenViduRole.js.map
+++ b/openvidu-node-client/lib/OpenViduRole.js.map
@@ -1 +1 @@
-{"version":3,"file":"OpenViduRole.js","sourceRoot":"","sources":["../src/OpenViduRole.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAEH,IAAY,YAgBX;AAhBD,WAAY,YAAY;IAEpB;;OAEG;IACH,yCAAyB,CAAA;IAEzB;;OAEG;IACH,uCAAuB,CAAA;IAEvB;;OAEG;IACH,uCAAuB,CAAA;AAC3B,CAAC,EAhBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAgBvB"}
\ No newline at end of file
+{"version":3,"file":"OpenViduRole.js","sourceRoot":"","sources":["../src/OpenViduRole.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAEH,IAAY,YAiBX;AAjBD,WAAY,YAAY;IAEpB;;OAEG;IACH,yCAAyB,CAAA;IAEzB;;OAEG;IACH,uCAAuB,CAAA;IAEvB;;;OAGG;IACH,uCAAuB,CAAA;AAC3B,CAAC,EAjBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAiBvB"}
\ No newline at end of file
diff --git a/openvidu-node-client/lib/TokenOptions.d.ts b/openvidu-node-client/lib/TokenOptions.d.ts
index 8adaef05..396d7274 100644
--- a/openvidu-node-client/lib/TokenOptions.d.ts
+++ b/openvidu-node-client/lib/TokenOptions.d.ts
@@ -6,9 +6,9 @@ export interface TokenOptions {
      * - If you have provided some data when calling `Session.connect(TOKEN, DATA)` (`DATA` defined), then `Connection.data` will have the following structure: `"CLIENT_DATA%/%SERVER_DATA"`, being `CLIENT_DATA` the second
      * parameter passed in OpenVidu Browser in method `Session.connect` and `SERVER_DATA` this [[TokenOptions.data]] property.
      */
-    data: string;
+    data?: string;
     /**
      * The role assigned to this token
      */
-    role: OpenViduRole;
+    role?: OpenViduRole;
 }
diff --git a/openvidu-node-client/package-lock.json b/openvidu-node-client/package-lock.json
index 8b601cfb..c1ae5b4b 100644
--- a/openvidu-node-client/package-lock.json
+++ b/openvidu-node-client/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "openvidu-node-client",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {