diff --git a/apis/ddi_api/index.html b/apis/ddi_api/index.html
index a5a43be..978270b 100644
--- a/apis/ddi_api/index.html
+++ b/apis/ddi_api/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Direct Device Integration API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -404,8 +404,7 @@
 			<h1>Direct Device Integration API </h1>
 
 			<p>The hawkBit <a href="https://github.com/eclipse/hawkbit">update server</a> provides REST resources which are consumed by the device to retrieve software update tasks.
-This API is based on HTTP standards and a polling mechanism.
-</p>
+This API is based on HTTP standards and a polling mechanism.</p>
 
 <div class="admonition note">
 <p class="admonition-title"></p>
@@ -478,7 +477,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/dmf_api/index.html b/apis/dmf_api/index.html
index 3e2b0d3..d3823f7 100644
--- a/apis/dmf_api/index.html
+++ b/apis/dmf_api/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Device Management Federation API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -404,8 +404,7 @@
 			<h1>Device Management Federation API </h1>
 
 			<p>The DMF API provides Java classes which allows that the message body can be deserialized at runtime into a Java object. Also Java classes can be used to serialize Java objects into JSON bodies to send a message to hawkBit.
-Currently, bodies of messages are based on JSON.
-</p>
+Currently, bodies of messages are based on JSON.</p>
 
 <h2 id="basics">Basics</h2>
 
@@ -425,14 +424,13 @@
 The user decides who can produce on an exchange and who can create bindings on that exchange for delivery to a specific queue.</p>
 
 <p>hawkBit will create all necessary queues, exchanges and bindings for the user, making it easy to get started.
-The exchange name for outgoing messages is <strong>dmf.exchange</strong>.
-The queue name for incoming messages is <strong>sp_direct_queue</strong>. Unless a <code>reply_to</code> header is set, hawkBit will reply on the <strong>sp.direct.exchange</strong> which is bound to the <strong>sp_direct_queue</strong>.</p>
+The exchange name for outgoing messages is <strong>dmf.exchange</strong>.</p>
 
-<p>The user can set a <code>reply_to</code> header (see chapter below), to change the default sender exchange.</p>
+<p>The user has to set a <code>reply_to</code> header (see chapter below), to change the default sender exchange.</p>
 
 <p>The following chapter describes the message body, header and properties.</p>
 
-<p>Note: the DMF protocol was intended to be open for other non update use cases by design (e.g. <a href="https://github.com/eclipse/hono">Eclipse Hono</a>. As a result, DMF uses the term <strong>thing</strong> and not <strong>target</strong> but they are actually synonyms in this case.</p>
+<p>Note: the DMF protocol was intended to be compatible to other use cases by design. As a result, DMF uses the term <strong>thing</strong> and not <strong>target</strong> but they are actually synonyms in this case.</p>
 
 <h2 id="messages-sent-to-hawkbit">Messages sent to hawkBit</h2>
 
@@ -466,17 +464,10 @@
 </tr>
 
 <tr>
-<td>sender</td>
-<td>Name of the message sender</td>
-<td>String</td>
-<td>false</td>
-</tr>
-
-<tr>
 <td>tenant</td>
 <td>The tenant this thing belongs to</td>
 <td>String</td>
-<td>false</td>
+<td>true</td>
 </tr>
 </tbody>
 </table>
@@ -493,18 +484,11 @@
 
 <tbody>
 <tr>
-<td>content_type</td>
-<td>The content type of the payload</td>
+<td>reply_to</td>
+<td>Exchange to reply to.</td>
 <td>String</td>
 <td>true</td>
 </tr>
-
-<tr>
-<td>reply_to</td>
-<td>Exchange to reply to. The default is sp.direct.exchange which is bound to the sp_direct_queue</td>
-<td>String</td>
-<td>false</td>
-</tr>
 </tbody>
 </table>
 
@@ -520,8 +504,8 @@
 
 <tbody>
 <tr>
-<td>type=THING_CREATED <br /> tenant=tenant123 <br /> thingId=abc  <br /> sender=Lwm2m</td>
-<td>content_type=application/json <br /> reply_to (optional) =sp.connector.replyTo</td>
+<td>type=THING_CREATED <br /> tenant=tenant123 <br /> thingId=abc</td>
+<td>reply_to=dmfclient.replyTo</td>
 </tr>
 </tbody>
 </table>
@@ -564,7 +548,7 @@
 <td>tenant</td>
 <td>The tenant this thing belongs to</td>
 <td>String</td>
-<td>false</td>
+<td>true</td>
 </tr>
 </tbody>
 </table>
@@ -601,8 +585,8 @@
 
 <tbody>
 <tr>
-<td>type=EVENT <br /> tenant=tenant123 <br /> thingId=abc  <br /> topic=UPDATE_ATTRIBUTES</td>
-<td>content_type=application/json <br /></td>
+<td>type=EVENT <br /> tenant=tenant123 <br /> thingId=abc <br /> topic=UPDATE_ATTRIBUTES</td>
+<td>content_type=application/json</td>
 </tr>
 </tbody>
 </table>
@@ -610,10 +594,10 @@
 <p>Payload Template</p>
 
 <pre><code class="language-json">{
-	&quot;attributes&quot;: {
-		&quot;exampleKey1&quot; : &quot;exampleValue1&quot;,
-		&quot;exampleKey2&quot; : &quot;exampleValue2&quot;
-	}
+  &quot;attributes&quot;: {
+    &quot;exampleKey1&quot;: &quot;exampleValue1&quot;,
+    &quot;exampleKey2&quot;: &quot;exampleValue2&quot;
+  }
 }
 </code></pre>
 
@@ -650,7 +634,7 @@
 <td>tenant</td>
 <td>The tenant this thing belongs to</td>
 <td>String</td>
-<td>false</td>
+<td>true</td>
 </tr>
 </tbody>
 </table>
@@ -678,10 +662,10 @@
 <p>Payload Template</p>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;: long,
-   &quot;softwareModuleId&quot;: long,
-   &quot;actionStatus&quot;:&quot;String&quot;,
-   &quot;message&quot;:[&quot;String&quot;]
+  &quot;actionId&quot;: long,
+  &quot;softwareModuleId&quot;: long,
+  &quot;actionStatus&quot;: &quot;String&quot;,
+  &quot;message&quot;: [&quot;String&quot;]
 }
 </code></pre>
 
@@ -750,17 +734,17 @@
 
 <tbody>
 <tr>
-<td>type=EVENT  <br /> tenant=tenant123 <br /> topic=UPDATE_ACTION_STATUS</td>
+<td>type=EVENT <br /> tenant=tenant123 <br /> topic=UPDATE_ACTION_STATUS</td>
 <td>content_type=application/json</td>
 </tr>
 </tbody>
 </table>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;:137,
-   &quot;softwareModuleId&quot;:17,
-   &quot;actionStatus&quot;:&quot;DOWNLOAD&quot;,
-   &quot;message&quot;:[&quot;The download has started&quot;]
+  &quot;actionId&quot;: 137,
+  &quot;softwareModuleId&quot;: 17,
+  &quot;actionStatus&quot;: &quot;DOWNLOAD&quot;,
+  &quot;message&quot;: [&quot;The download has started&quot;]
 }
 </code></pre>
 
@@ -802,7 +786,7 @@
 <td>tenant</td>
 <td>The tenant this thing belongs to</td>
 <td>String</td>
-<td>false</td>
+<td>true</td>
 </tr>
 </tbody>
 </table>
@@ -830,7 +814,7 @@
 <p>Payload Template</p>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;: long
+  &quot;actionId&quot;: long
 }
 </code></pre>
 
@@ -846,14 +830,14 @@
 
 <tbody>
 <tr>
-<td>type=EVENT <br /> tenant=tenant123 <br /> thingId=abc  <br /> topic=CANCEL_DOWNLOAD</td>
+<td>type=EVENT <br /> tenant=tenant123 <br /> thingId=abc <br /> topic=CANCEL_DOWNLOAD</td>
 <td>content_type=application/json</td>
 </tr>
 </tbody>
 </table>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;:137
+  &quot;actionId&quot;: 137
 }
 </code></pre>
 
@@ -871,17 +855,17 @@
 
 <tbody>
 <tr>
-<td>type=EVENT  <br /> tenant=tenant123 <br /> topic=UPDATE_ACTION_STATUS</td>
+<td>type=EVENT <br /> tenant=tenant123 <br /> topic=UPDATE_ACTION_STATUS</td>
 <td>content_type=application/json</td>
 </tr>
 </tbody>
 </table>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;:137,
-   &quot;softwareModuleId&quot;:17,
-   &quot;actionStatus&quot;:&quot;CANCELED&quot;,
-   &quot;message&quot;:[&quot;The update was canceled.&quot;]
+  &quot;actionId&quot;: 137,
+  &quot;softwareModuleId&quot;: 17,
+  &quot;actionStatus&quot;: &quot;CANCELED&quot;,
+  &quot;message&quot;: [&quot;The update was canceled.&quot;]
 }
 </code></pre>
 
@@ -897,23 +881,25 @@
 
 <tbody>
 <tr>
-<td>type=EVENT  <br /> tenant=tenant123 <br /> topic=UPDATE_ACTION_STATUS</td>
+<td>type=EVENT <br /> tenant=tenant123 <br /> topic=UPDATE_ACTION_STATUS</td>
 <td>content_type=application/json</td>
 </tr>
 </tbody>
 </table>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;:137,
-   &quot;softwareModuleId&quot;:17,
-   &quot;actionStatus&quot;:&quot;CANCEL_REJECTED&quot;,
-   &quot;message&quot;:[&quot;The cancellation was not possible since the target sent an unexpected response.&quot;]
+  &quot;actionId&quot;: 137,
+  &quot;softwareModuleId&quot;: 17,
+  &quot;actionStatus&quot;: &quot;CANCEL_REJECTED&quot;,
+  &quot;message&quot;: [
+    &quot;The cancellation was not possible since the target sent an unexpected response.&quot;
+  ]
 }
 </code></pre>
 
 <h2 id="messages-sent-by-hawkbit">Messages sent by hawkBit</h2>
 
-<p>All messages from hawkBit will be sent to the <strong>sp_direct_queue</strong> or the one specified in the <code>reply_to</code> property.</p>
+<p>All messages from hawkBit will be sent to the specified exchange in the <code>reply_to</code> property.</p>
 
 <h3 id="message-sent-by-hawkbit-to-initialize-an-update-task">Message sent by hawkBit to initialize an update task</h3>
 
@@ -953,7 +939,7 @@
 <td>tenant</td>
 <td>The tenant this thing belongs to</td>
 <td>String</td>
-<td>false</td>
+<td>true</td>
 </tr>
 </tbody>
 </table>
@@ -983,33 +969,35 @@
 <p>Payload Template</p>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;: long,
-   &quot;targetSecurityToken&quot;: &quot;String&quot;,
-   &quot;softwareModules&quot;:[
-       {
-       &quot;moduleId&quot;: long,
-       &quot;moduleType&quot;:&quot;String&quot;,
-       &quot;moduleVersion&quot;:&quot;String&quot;,
-       &quot;artifacts&quot;:[
-           {
-           &quot;filename&quot;:&quot;String&quot;,
-           &quot;urls&quot;:{
-               &quot;HTTP&quot;:&quot;String&quot;,
-               &quot;HTTPS&quot;:&quot;String&quot;
-               },
-           &quot;hashes&quot;:{
-               &quot;md5&quot;:&quot;String&quot;,
-               &quot;sha1&quot;:&quot;String&quot;
-               },
-           &quot;size&quot;:long
-           }],
-       &quot;metadata&quot;:[
-           {
-               &quot;key&quot;:&quot;String&quot;,
-               &quot;value&quot;:&quot;String&quot;
-           }
-       ]
-       }]
+  &quot;actionId&quot;: long,
+  &quot;targetSecurityToken&quot;: &quot;String&quot;,
+  &quot;softwareModules&quot;: [
+    {
+      &quot;moduleId&quot;: long,
+      &quot;moduleType&quot;: &quot;String&quot;,
+      &quot;moduleVersion&quot;: &quot;String&quot;,
+      &quot;artifacts&quot;: [
+        {
+          &quot;filename&quot;: &quot;String&quot;,
+          &quot;urls&quot;: {
+            &quot;HTTP&quot;: &quot;String&quot;,
+            &quot;HTTPS&quot;: &quot;String&quot;
+          },
+          &quot;hashes&quot;: {
+            &quot;md5&quot;: &quot;String&quot;,
+            &quot;sha1&quot;: &quot;String&quot;
+          },
+          &quot;size&quot;: long
+        }
+      ],
+      &quot;metadata&quot;: [
+        {
+          &quot;key&quot;: &quot;String&quot;,
+          &quot;value&quot;: &quot;String&quot;
+        }
+      ]
+    }
+  ]
 }
 </code></pre>
 
@@ -1025,39 +1013,42 @@
 
 <tbody>
 <tr>
-<td>type=EVENT  <br /> tenant=tenant123 <br /> thingId=abc  <br /> topic=DOWNLOAD_AND_INSTALL</td>
+<td>type=EVENT <br /> tenant=tenant123 <br /> thingId=abc <br /> topic=DOWNLOAD_AND_INSTALL</td>
 <td>content_type=application/json</td>
 </tr>
 </tbody>
 </table>
 
 <pre><code class="language-json">{
-   &quot;actionId&quot;:137,
-   &quot;targetSecurityToken&quot;:&quot;bH7XXAprK1ChnLfKSdtlsp7NOlPnZAYY&quot;,
-   &quot;softwareModules&quot;:[{
-       &quot;moduleId&quot;:7,
-       &quot;moduleType&quot;:&quot;firmware&quot;,
-       &quot;moduleVersion&quot;:&quot;7.7.7&quot;,
-       &quot;artifacts&quot;:[
-           {
-           &quot;filename&quot;:&quot;artifact.zip&quot;,
-           &quot;urls&quot;:{
-               &quot;HTTP&quot;:&quot;http://download-from-url.com&quot;,
-               &quot;HTTPS&quot;:&quot;https://download-from-url.com&quot;
-               },
-           &quot;hashes&quot;:{
-               &quot;md5&quot;:&quot;md5hash&quot;,
-               &quot;sha1&quot;:&quot;sha1hash&quot;
-               },
-           &quot;size&quot;:512
-           }],
-       &quot;metadata&quot;:[
-           {
-               &quot;key&quot;:&quot;installationType&quot;,
-               &quot;value&quot;:&quot;5784K#&quot;
-           }
-       ]
-    }]
+  &quot;actionId&quot;: 137,
+  &quot;targetSecurityToken&quot;: &quot;bH7XXAprK1ChnLfKSdtlsp7NOlPnZAYY&quot;,
+  &quot;softwareModules&quot;: [
+    {
+      &quot;moduleId&quot;: 7,
+      &quot;moduleType&quot;: &quot;firmware&quot;,
+      &quot;moduleVersion&quot;: &quot;7.7.7&quot;,
+      &quot;artifacts&quot;: [
+        {
+          &quot;filename&quot;: &quot;artifact.zip&quot;,
+          &quot;urls&quot;: {
+            &quot;HTTP&quot;: &quot;http://download-from-url.com&quot;,
+            &quot;HTTPS&quot;: &quot;https://download-from-url.com&quot;
+          },
+          &quot;hashes&quot;: {
+            &quot;md5&quot;: &quot;md5hash&quot;,
+            &quot;sha1&quot;: &quot;sha1hash&quot;
+          },
+          &quot;size&quot;: 512
+        }
+      ],
+      &quot;metadata&quot;: [
+        {
+          &quot;key&quot;: &quot;installationType&quot;,
+          &quot;value&quot;: &quot;5784K#&quot;
+        }
+      ]
+    }
+  ]
 }
 </code></pre>
 
@@ -1069,7 +1060,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/index.html b/apis/index.html
index b33ca63..7f96305 100644
--- a/apis/index.html
+++ b/apis/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Apis - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -415,8 +415,7 @@
 			</a>
 
 			<br>
-			The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).
- <br><a href="https://www.eclipse.org/hawkbit/apis/management_api/">[...]</a>
+			The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software). <br><a href="https://www.eclipse.org/hawkbit/apis/management_api/">[...]</a>
 
 			<hr>
 			
@@ -426,8 +425,7 @@
 
 			<br>
 			The hawkBit <a href="https://github.com/eclipse/hawkbit">update server</a> provides REST resources which are consumed by the device to retrieve software update tasks.
-This API is based on HTTP standards and a polling mechanism.
- <br><a href="https://www.eclipse.org/hawkbit/apis/ddi_api/">[...]</a>
+This API is based on HTTP standards and a polling mechanism. <br><a href="https://www.eclipse.org/hawkbit/apis/ddi_api/">[...]</a>
 
 			<hr>
 			
@@ -437,8 +435,7 @@
 
 			<br>
 			The DMF API provides Java classes which allows that the message body can be deserialized at runtime into a Java object. Also Java classes can be used to serialize Java objects into JSON bodies to send a message to hawkBit.
-Currently, bodies of messages are based on JSON.
- <br><a href="https://www.eclipse.org/hawkbit/apis/dmf_api/">[...]</a>
+Currently, bodies of messages are based on JSON. <br><a href="https://www.eclipse.org/hawkbit/apis/dmf_api/">[...]</a>
 
 			<hr>
 			
@@ -451,7 +448,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/index.xml b/apis/index.xml
index 5238131..b3815d4 100644
--- a/apis/index.xml
+++ b/apis/index.xml
@@ -16,8 +16,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/apis/management_api/</guid>
-      <description>&lt;p&gt;The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -27,8 +26,7 @@
       
       <guid>https://www.eclipse.org/hawkbit/apis/ddi_api/</guid>
       <description>&lt;p&gt;The hawkBit &lt;a href=&#34;https://github.com/eclipse/hawkbit&#34;&gt;update server&lt;/a&gt; provides REST resources which are consumed by the device to retrieve software update tasks.
-This API is based on HTTP standards and a polling mechanism.
-&lt;/p&gt;</description>
+This API is based on HTTP standards and a polling mechanism.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -38,8 +36,7 @@
       
       <guid>https://www.eclipse.org/hawkbit/apis/dmf_api/</guid>
       <description>&lt;p&gt;The DMF API provides Java classes which allows that the message body can be deserialized at runtime into a Java object. Also Java classes can be used to serialize Java objects into JSON bodies to send a message to hawkBit.
-Currently, bodies of messages are based on JSON.
-&lt;/p&gt;</description>
+Currently, bodies of messages are based on JSON.&lt;/p&gt;</description>
     </item>
     
   </channel>
diff --git a/apis/management_api/index.html b/apis/management_api/index.html
index 312e7ac..375c28c 100644
--- a/apis/management_api/index.html
+++ b/apis/management_api/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Management API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Management API </h1>
 
-			<p>The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).
-</p>
+			<p>The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).</p>
 
 <p>Based on the Management API you can manage and monitor software update operations via HTTP/HTTPS. The <em>Management API</em> supports JSON payload with hypermedia as well as filtering, sorting and paging. Furthermore the Management API provides permission based access control and standard roles as well as custom role creation.</p>
 
@@ -489,7 +488,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/distributionsets/index.html b/apis/mgmt/distributionsets/index.html
index d9725ca..57c4323 100644
--- a/apis/mgmt/distributionsets/index.html
+++ b/apis/mgmt/distributionsets/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Distribution Sets API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/distributionsettag/index.html b/apis/mgmt/distributionsettag/index.html
index a49479e..c33983e 100644
--- a/apis/mgmt/distributionsettag/index.html
+++ b/apis/mgmt/distributionsettag/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Distribution Set Tag API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/distributionsettypes/index.html b/apis/mgmt/distributionsettypes/index.html
index 9b20166..950b7da 100644
--- a/apis/mgmt/distributionsettypes/index.html
+++ b/apis/mgmt/distributionsettypes/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Distribution Set Types API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/index.html b/apis/mgmt/index.html
index eec26cd..252b41c 100644
--- a/apis/mgmt/index.html
+++ b/apis/mgmt/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title> - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -506,7 +506,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/rollouts/index.html b/apis/mgmt/rollouts/index.html
index 0048f7a..6c66bd1 100644
--- a/apis/mgmt/rollouts/index.html
+++ b/apis/mgmt/rollouts/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Rollouts API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/softwaremodules/index.html b/apis/mgmt/softwaremodules/index.html
index 7bfe50d..6f8e6e9 100644
--- a/apis/mgmt/softwaremodules/index.html
+++ b/apis/mgmt/softwaremodules/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Software Modules API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/softwaremoduletypes/index.html b/apis/mgmt/softwaremoduletypes/index.html
index d07f4b1..46be257 100644
--- a/apis/mgmt/softwaremoduletypes/index.html
+++ b/apis/mgmt/softwaremoduletypes/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Software Module Types API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/targetfilters/index.html b/apis/mgmt/targetfilters/index.html
index 9f56e86..efd0a05 100644
--- a/apis/mgmt/targetfilters/index.html
+++ b/apis/mgmt/targetfilters/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Target Filters API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/targets/index.html b/apis/mgmt/targets/index.html
index 8dd632c..380b000 100644
--- a/apis/mgmt/targets/index.html
+++ b/apis/mgmt/targets/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Targets API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/targettag/index.html b/apis/mgmt/targettag/index.html
index 2e7c92d..16da753 100644
--- a/apis/mgmt/targettag/index.html
+++ b/apis/mgmt/targettag/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Target Tag API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/apis/mgmt/tenant/index.html b/apis/mgmt/tenant/index.html
index 9ad3391..1e05f03 100644
--- a/apis/mgmt/tenant/index.html
+++ b/apis/mgmt/tenant/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>System Configuration API - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -414,7 +414,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/architecture/index.html b/architecture/index.html
index 6b864d9..18ce83c 100644
--- a/architecture/index.html
+++ b/architecture/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Architecture - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -418,7 +418,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/categories/index.html b/categories/index.html
index f4a0f79..08e577e 100644
--- a/categories/index.html
+++ b/categories/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Categories - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -416,7 +416,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/community/index.html b/community/index.html
index ba21268..0e8e472 100644
--- a/community/index.html
+++ b/community/index.html
@@ -1,24 +1,24 @@
 <!DOCTYPE html>
-
-
-
-
-   <html class="no-js">
+  
+  
+  
+  
+   <html class="no-js"> 
 
   <head lang="en-us">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Community - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
-
+    
     <meta name="description" content="IoT. Update. Device.">
-
+    
     <link rel="canonical" href="https://www.eclipse.org/hawkbit/community/">
-
+    
     <meta name="author" content="The Eclipse hawkBit Project">
-
+    
 
     <meta property="og:url" content="https://www.eclipse.org/hawkbit/community/">
     <meta property="og:title" content="Eclipse hawkBit">
@@ -27,7 +27,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
-
+    
 
     <link rel="shortcut icon" type="image/x-icon" href="https://www.eclipse.org/hawkbit/images/favicon.ico">
     <link rel="icon" type="image/x-icon" href="https://www.eclipse.org/hawkbit/images/favicon.ico">
@@ -54,9 +54,9 @@
     <link rel="stylesheet" href="https://www.eclipse.org/hawkbit/stylesheets/palettes.css">
     <link rel="stylesheet" href="https://www.eclipse.org/hawkbit/stylesheets/highlight/highlight.css">
 
-
-
-
+    
+    
+    
     <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu:400,700|Ubuntu&#43;Mono">
     <style>
       body, input {
@@ -67,15 +67,15 @@
       }
     </style>
 
-
+    
     <link rel="stylesheet" href="https://www.eclipse.org/hawkbit/css/hawkbit.css">
-
+    
     <link rel="stylesheet" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css">
-
+    
     <script src="https://www.eclipse.org/hawkbit/javascripts/modernizr.js"></script>
     <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
 
-
+    
 
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
   </head>
@@ -83,8 +83,8 @@
 
 
 
-
-
+	
+	
 
 
 <div class="backdrop">
@@ -109,27 +109,27 @@
       </div>
     </div>
 
+    
 
-
-
+    
     <div class="button button-github" role="button" aria-label="GitHub">
       <a href="https://github.com/eclipse/hawkbit" title="@eclipse/hawkbit on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
     </div>
+    
 
-
-
+    
     <div class="button button-github" role="button" aria-label="Gitter">
       <a href="https://gitter.im/eclipse/hawkbit" title="@eclipse/hawkbit on Gitter" target="_blank" class="toggle-button icon fab fa-gitter"></a>
     </div>
+    
 
-
-
+    
     <div class="button button-github" role="button" aria-label="Docker">
       <a href="https://hub.docker.com/u/hawkbit" title="hawkbit on Docker Hub" target="_blank" class="toggle-button icon fab fa-docker"></a>
     </div>
-
-
-
+    
+    
+        
   </div>
   <div class="bar search">
     <div class="button button-close" role="button" aria-label="Close">
@@ -152,24 +152,24 @@
 		<nav aria-label="Navigation">
   <a href="https://www.eclipse.org/hawkbit/" class="project">
     <div class="banner">
-
+      
         <div class="logo">
           <img src="https://www.eclipse.org/hawkbit/images/hawkbit_icon.png">
         </div>
-
+      
       <div class="name">
         <strong>Eclipse hawkBit&trade; </strong>
-
+        
           <br>
           eclipse/hawkbit
-
+        
       </div>
     </div>
   </a>
 
   <div class="scrollable">
     <div class="wrapper">
-
+      
         <ul class="repo">
           <li class="repo-download">
             <a href="https://hawkbit.eclipse.org" target="_blank" title="hawkBit Sandbox" data-action="sandbox">
@@ -184,160 +184,160 @@
           </li>
         </ul>
         <hr>
-
+      
 
       <div class="toc">
-
+        
         <ul>
-
+          
 
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="What is hawkBit" href="/hawkbit/whatishawkbit/">
-
+	
 	What is hawkBit
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Getting started" href="/hawkbit/gettingstarted/">
-
+	
 	Getting started
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Guides" href="/hawkbit/guides/">
-
+	
 	Guides
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Features" href="/hawkbit/features/">
-
+	
 	Features
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Concepts" href="/hawkbit/concepts/">
-
+	
 	Concepts
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Architecture" href="/hawkbit/architecture/">
-
+	
 	Architecture
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Management UI" href="/hawkbit/ui/">
-
+	
 	Management UI
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="APIs" href="/hawkbit/apis/">
-
+	
 	APIs
 </a>
 
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a class="current" title="Community" href="/hawkbit/community/">
-
+	
 	Community
 </a>
 
@@ -345,31 +345,31 @@
 <ul id="scrollspy">
 </ul>
 
-
+  
 </li>
 
 
 
 <li>
-
-
+  
+    
 
 
 
 <a  title="Release notes" href="/hawkbit/release-notes/">
-
+	
 	Release notes
 </a>
 
 
-
+  
 </li>
 
 
         </ul>
+        
 
-
-
+        
         <hr>
 
         <ul>
@@ -394,7 +394,7 @@
             </a>
           </li>
         </ul>
-
+        
       </div>
     </div>
   </div>
@@ -406,7 +406,7 @@
 		<div class="wrapper">
 			<h1>Community </h1>
 
-
+			
 
 <h2 id="presentations">Presentations</h2>
 
@@ -455,9 +455,9 @@
     </a>
   </div>
   <p class="notice">
-
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
-
+    
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
+    
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
     using the
@@ -484,11 +484,11 @@
 
 
 			<footer class="footer">
-
+				
 
 <nav class="pagination" aria-label="Footer">
   <div class="previous">
-
+  
       <a href="https://www.eclipse.org/hawkbit/apis/dmf_api/" title="Device Management Federation API">
         <span class="direction">
           Previous
@@ -504,11 +504,11 @@
           </div>
         </div>
       </a>
-
+  
   </div>
 
   <div class="next">
-
+  
       <a href="https://www.eclipse.org/hawkbit/release-notes/" title="Release notes">
         <span class="direction">
           Next
@@ -524,7 +524,7 @@
           </div>
         </div>
       </a>
-
+  
   </div>
 </nav>
 
@@ -547,14 +547,14 @@
 </main>
 
     <script>
-
+    
       var base_url = 'https:\/\/www.eclipse.org\/hawkbit\/';
       var repo_id  = 'eclipse\/hawkbit';
-
+    
     </script>
 
     <script src="https://www.eclipse.org/hawkbit/javascripts/application.js"></script>
-
+    
 
     <script>
       /* Add headers to scrollspy */
@@ -601,3 +601,4 @@
     <script>hljs.initHighlightingOnLoad();</script>
   </body>
 </html>
+
diff --git a/concepts/authentication/index.html b/concepts/authentication/index.html
index 1e57672..7cb8b49 100644
--- a/concepts/authentication/index.html
+++ b/concepts/authentication/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Authentication - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -409,8 +409,7 @@
 <li><em>Direct Device Integration (DDI) API</em> by <strong>targets</strong>.</li>
 <li><em>Management API</em> by 3rd party <strong>applications</strong>.</li>
 <li><em>Device Management Federation (DMF) API</em> by 3rd party <strong>applications</strong> through AMQP.</li>
-<li><em>Management UI</em> by <strong>users</strong>.
-</li>
+<li><em>Management UI</em> by <strong>users</strong>.</li>
 </ul>
 
 <h2 id="ddi-api-authentication-modes">DDI API Authentication Modes</h2>
@@ -487,7 +486,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/concepts/authorization/index.html b/concepts/authorization/index.html
index a7dff0a..e017778 100644
--- a/concepts/authorization/index.html
+++ b/concepts/authorization/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Authorization - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Authorization </h1>
 
-			<p>Authorization is handled separately for <em>Direct Device Integration (DDI) API</em> and <em>Device Management Federation (DMF) API</em> (where successful authentication includes full authorization) and <em>Management API</em> and <em>UI</em> which is based on Spring security <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java">authorities</a>.
-</p>
+			<p>Authorization is handled separately for <em>Direct Device Integration (DDI) API</em> and <em>Device Management Federation (DMF) API</em> (where successful authentication includes full authorization) and <em>Management API</em> and <em>UI</em> which is based on Spring security <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java">authorities</a>.</p>
 
 <p>However, keep in mind that hawkBit does not offer an off the shelf authentication provider to leverage these permissions and the underlying multi user/tenant capabilities of hawkBit. Check out <a href="http://projects.spring.io/spring-security/">Spring security documentation</a> for further information. In hawkBit <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java">SecurityAutoConfiguration</a> is a good starting point for integration.</p>
 
@@ -519,7 +518,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/concepts/datamodel/index.html b/concepts/datamodel/index.html
index f1e8534..0d058cc 100644
--- a/concepts/datamodel/index.html
+++ b/concepts/datamodel/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Data Model - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Data Model </h1>
 
-			<p>The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.
-</p>
+			<p>The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.</p>
 
 <p>It does define a hierarchy of software that starts with a distribution, which can have (sub-)modules and these may have multiple artifacts. However, it does not consider any kind of dependency definitions between modules or artifacts. As a result dependency checks if necessary have to be done outside hawkBit, i.e. on the device itself or before the entity creation in hawkBit by the origin.</p>
 
@@ -455,7 +454,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/concepts/index.html b/concepts/index.html
index 630bdfc..89686f2 100644
--- a/concepts/index.html
+++ b/concepts/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Concepts - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -415,21 +415,14 @@
 			</a>
 
 			<br>
-			<p>A hawkBit update server can be accessed in four different ways:</p>
+			A hawkBit update server can be accessed in four different ways:</p>
 
 <ul>
 <li><em>Direct Device Integration (DDI) API</em> by <strong>targets</strong>.</li>
 <li><em>Management API</em> by 3rd party <strong>applications</strong>.</li>
 <li><em>Device Management Federation (DMF) API</em> by 3rd party <strong>applications</strong> through AMQP.</li>
-<li><em>Management UI</em> by <strong>users</strong>.
-</li>
+<li><em>Management UI</em> by <strong>users</strong>.</li>
 </ul>
-
-<h2 id="ddi-api-authentication-modes">DDI API Authentication Modes</h2>
-
-<h3 id="security-token">Security Token</h3>
-
-<p>hawkBit supports multiple ways to authenticate a target against the server. The different authentication modes can be individual enabled and disabled within hawkBit. Both on system level (with Spring Boot properties) as per individual tenant.</p>
  <br><a href="https://www.eclipse.org/hawkbit/concepts/authentication/">[...]</a>
 
 			<hr>
@@ -439,8 +432,7 @@
 			</a>
 
 			<br>
-			Authorization is handled separately for <em>Direct Device Integration (DDI) API</em> and <em>Device Management Federation (DMF) API</em> (where successful authentication includes full authorization) and <em>Management API</em> and <em>UI</em> which is based on Spring security <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java">authorities</a>.
- <br><a href="https://www.eclipse.org/hawkbit/concepts/authorization/">[...]</a>
+			Authorization is handled separately for <em>Direct Device Integration (DDI) API</em> and <em>Device Management Federation (DMF) API</em> (where successful authentication includes full authorization) and <em>Management API</em> and <em>UI</em> which is based on Spring security <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java">authorities</a>. <br><a href="https://www.eclipse.org/hawkbit/concepts/authorization/">[...]</a>
 
 			<hr>
 			
@@ -449,8 +441,7 @@
 			</a>
 
 			<br>
-			The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.
- <br><a href="https://www.eclipse.org/hawkbit/concepts/datamodel/">[...]</a>
+			The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other. <br><a href="https://www.eclipse.org/hawkbit/concepts/datamodel/">[...]</a>
 
 			<hr>
 			
@@ -459,8 +450,7 @@
 			</a>
 
 			<br>
-			Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.
- <br><a href="https://www.eclipse.org/hawkbit/concepts/rollout-management/">[...]</a>
+			Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling. <br><a href="https://www.eclipse.org/hawkbit/concepts/rollout-management/">[...]</a>
 
 			<hr>
 			
@@ -469,8 +459,7 @@
 			</a>
 
 			<br>
-			A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &ldquo;I am here&rdquo;, &ldquo;I am working on a provisioning&rdquo;, &ldquo;I have finished a provisioning&rdquo;.
- <br><a href="https://www.eclipse.org/hawkbit/concepts/targetstate/">[...]</a>
+			A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &ldquo;I am here&rdquo;, &ldquo;I am working on a provisioning&rdquo;, &ldquo;I have finished a provisioning&rdquo;. <br><a href="https://www.eclipse.org/hawkbit/concepts/targetstate/">[...]</a>
 
 			<hr>
 			
@@ -483,7 +472,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/concepts/index.xml b/concepts/index.xml
index fa10f36..ee704ad 100644
--- a/concepts/index.xml
+++ b/concepts/index.xml
@@ -22,15 +22,8 @@
 &lt;li&gt;&lt;em&gt;Direct Device Integration (DDI) API&lt;/em&gt; by &lt;strong&gt;targets&lt;/strong&gt;.&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Management API&lt;/em&gt; by 3rd party &lt;strong&gt;applications&lt;/strong&gt;.&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Device Management Federation (DMF) API&lt;/em&gt; by 3rd party &lt;strong&gt;applications&lt;/strong&gt; through AMQP.&lt;/li&gt;
-&lt;li&gt;&lt;em&gt;Management UI&lt;/em&gt; by &lt;strong&gt;users&lt;/strong&gt;.
-&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h2 id=&#34;ddi-api-authentication-modes&#34;&gt;DDI API Authentication Modes&lt;/h2&gt;
-
-&lt;h3 id=&#34;security-token&#34;&gt;Security Token&lt;/h3&gt;
-
-&lt;p&gt;hawkBit supports multiple ways to authenticate a target against the server. The different authentication modes can be individual enabled and disabled within hawkBit. Both on system level (with Spring Boot properties) as per individual tenant.&lt;/p&gt;</description>
+&lt;li&gt;&lt;em&gt;Management UI&lt;/em&gt; by &lt;strong&gt;users&lt;/strong&gt;.&lt;/li&gt;
+&lt;/ul&gt;</description>
     </item>
     
     <item>
@@ -39,8 +32,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/authorization/</guid>
-      <description>&lt;p&gt;Authorization is handled separately for &lt;em&gt;Direct Device Integration (DDI) API&lt;/em&gt; and &lt;em&gt;Device Management Federation (DMF) API&lt;/em&gt; (where successful authentication includes full authorization) and &lt;em&gt;Management API&lt;/em&gt; and &lt;em&gt;UI&lt;/em&gt; which is based on Spring security &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java&#34;&gt;authorities&lt;/a&gt;.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;Authorization is handled separately for &lt;em&gt;Direct Device Integration (DDI) API&lt;/em&gt; and &lt;em&gt;Device Management Federation (DMF) API&lt;/em&gt; (where successful authentication includes full authorization) and &lt;em&gt;Management API&lt;/em&gt; and &lt;em&gt;UI&lt;/em&gt; which is based on Spring security &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java&#34;&gt;authorities&lt;/a&gt;.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -49,8 +41,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/datamodel/</guid>
-      <description>&lt;p&gt;The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -59,8 +50,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/rollout-management/</guid>
-      <description>&lt;p&gt;Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -69,8 +59,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/targetstate/</guid>
-      <description>&lt;p&gt;A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &amp;ldquo;I am here&amp;rdquo;, &amp;ldquo;I am working on a provisioning&amp;rdquo;, &amp;ldquo;I have finished a provisioning&amp;rdquo;.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &amp;ldquo;I am here&amp;rdquo;, &amp;ldquo;I am working on a provisioning&amp;rdquo;, &amp;ldquo;I have finished a provisioning&amp;rdquo;.&lt;/p&gt;</description>
     </item>
     
   </channel>
diff --git a/concepts/rollout-management/index.html b/concepts/rollout-management/index.html
index 9d57416..d5775f4 100644
--- a/concepts/rollout-management/index.html
+++ b/concepts/rollout-management/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Rollout Management - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Rollout Management </h1>
 
-			<p>Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.
-</p>
+			<p>Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.</p>
 
 <p>That includes:
 - <em>Technical Scalability</em> by means of horizontal scale of the hawkBit server cluster in the cloud.
@@ -461,7 +460,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/concepts/targetstate/index.html b/concepts/targetstate/index.html
index 311ae1e..6cc751a 100644
--- a/concepts/targetstate/index.html
+++ b/concepts/targetstate/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Target State Machine - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Target State Machine </h1>
 
-			<p>A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &ldquo;I am here&rdquo;, &ldquo;I am working on a provisioning&rdquo;, &ldquo;I have finished a provisioning&rdquo;.
-</p>
+			<p>A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &ldquo;I am here&rdquo;, &ldquo;I am working on a provisioning&rdquo;, &ldquo;I have finished a provisioning&rdquo;.</p>
 
 <h2 id="defined-states">Defined states</h2>
 
@@ -456,7 +455,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/features/index.html b/features/index.html
index 62bfbe5..c5c578e 100644
--- a/features/index.html
+++ b/features/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Features - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -408,7 +408,7 @@
 
 			
 
-<h2 id="device-and-software-repository">Device and software repository</h2>
+<h2 id="device-and-software-repository">Device and Software Repository</h2>
 
 <ul>
 <li>Repository that holds the provisioning targets and assignable software distributions.</li>
@@ -501,7 +501,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/gettingstarted/index.html b/gettingstarted/index.html
index b1048d5..d9366f1 100644
--- a/gettingstarted/index.html
+++ b/gettingstarted/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Getting Started - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -537,7 +537,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/guides/clustering/index.html b/guides/clustering/index.html
index 860b32f..6779b08 100644
--- a/guides/clustering/index.html
+++ b/guides/clustering/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Clustering - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Clustering </h1>
 
-			<p>hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md">hawkBit runtimes&rsquo;s README</a>.
-</p>
+			<p>hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md">hawkBit runtimes&rsquo;s README</a>.</p>
 
 <h2 id="big-picture">Big picture</h2>
 
@@ -457,7 +456,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/guides/customtheme/index.html b/guides/customtheme/index.html
index 038f611..24ce975 100644
--- a/guides/customtheme/index.html
+++ b/guides/customtheme/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Custom Theme - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Custom Theme </h1>
 
-			<p>This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).
-</p>
+			<p>This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).</p>
 
 <p>The mechanism described below is the rather simple case by customizing the theme by means of configuring a set of variables as defined by the hawkBit default theme. A full customization be means of copying the hawkBit theme and customize it completely is not described here but of course possible.</p>
 
@@ -464,7 +463,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/guides/feignclient/index.html b/guides/feignclient/index.html
index d41f0fc..4c23b08 100644
--- a/guides/feignclient/index.html
+++ b/guides/feignclient/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Feign Client - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Feign Client </h1>
 
-			<p>In this guide we describe how to create a <a href="https://github.com/Netflix/feign">Feign</a> Rest Client based on a  <a href="http://projects.spring.io/spring-boot/">Spring Boot</a> Application.
-</p>
+			<p>In this guide we describe how to create a <a href="https://github.com/Netflix/feign">Feign</a> Rest Client based on a  <a href="http://projects.spring.io/spring-boot/">Spring Boot</a> Application.</p>
 
 <h2 id="create-feign-rest-client">Create Feign REST Client</h2>
 
@@ -466,7 +465,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/guides/index.html b/guides/index.html
index d132b7b..30193de 100644
--- a/guides/index.html
+++ b/guides/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Guides - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -415,8 +415,7 @@
 			</a>
 
 			<br>
-			In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.
- <br><a href="https://www.eclipse.org/hawkbit/guides/runhawkbit/">[...]</a>
+			In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server. <br><a href="https://www.eclipse.org/hawkbit/guides/runhawkbit/">[...]</a>
 
 			<hr>
 			
@@ -425,8 +424,7 @@
 			</a>
 
 			<br>
-			In this guide we describe how to create a <a href="https://github.com/Netflix/feign">Feign</a> Rest Client based on a  <a href="http://projects.spring.io/spring-boot/">Spring Boot</a> Application.
- <br><a href="https://www.eclipse.org/hawkbit/guides/feignclient/">[...]</a>
+			In this guide we describe how to create a <a href="https://github.com/Netflix/feign">Feign</a> Rest Client based on a  <a href="http://projects.spring.io/spring-boot/">Spring Boot</a> Application. <br><a href="https://www.eclipse.org/hawkbit/guides/feignclient/">[...]</a>
 
 			<hr>
 			
@@ -435,8 +433,7 @@
 			</a>
 
 			<br>
-			hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md">hawkBit runtimes&rsquo;s README</a>.
- <br><a href="https://www.eclipse.org/hawkbit/guides/clustering/">[...]</a>
+			hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the <a href="https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md">hawkBit runtimes&rsquo;s README</a>. <br><a href="https://www.eclipse.org/hawkbit/guides/clustering/">[...]</a>
 
 			<hr>
 			
@@ -445,8 +442,7 @@
 			</a>
 
 			<br>
-			This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).
- <br><a href="https://www.eclipse.org/hawkbit/guides/customtheme/">[...]</a>
+			This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets). <br><a href="https://www.eclipse.org/hawkbit/guides/customtheme/">[...]</a>
 
 			<hr>
 			
@@ -459,7 +455,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/guides/index.xml b/guides/index.xml
index 9df2c63..b44811f 100644
--- a/guides/index.xml
+++ b/guides/index.xml
@@ -16,8 +16,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/runhawkbit/</guid>
-      <description>&lt;p&gt;In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -26,8 +25,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/feignclient/</guid>
-      <description>&lt;p&gt;In this guide we describe how to create a &lt;a href=&#34;https://github.com/Netflix/feign&#34;&gt;Feign&lt;/a&gt; Rest Client based on a  &lt;a href=&#34;http://projects.spring.io/spring-boot/&#34;&gt;Spring Boot&lt;/a&gt; Application.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;In this guide we describe how to create a &lt;a href=&#34;https://github.com/Netflix/feign&#34;&gt;Feign&lt;/a&gt; Rest Client based on a  &lt;a href=&#34;http://projects.spring.io/spring-boot/&#34;&gt;Spring Boot&lt;/a&gt; Application.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -36,8 +34,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/clustering/</guid>
-      <description>&lt;p&gt;hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md&#34;&gt;hawkBit runtimes&amp;rsquo;s README&lt;/a&gt;.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md&#34;&gt;hawkBit runtimes&amp;rsquo;s README&lt;/a&gt;.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -46,8 +43,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/customtheme/</guid>
-      <description>&lt;p&gt;This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).&lt;/p&gt;</description>
     </item>
     
   </channel>
diff --git a/guides/runhawkbit/index.html b/guides/runhawkbit/index.html
index d4595e8..0a0a905 100644
--- a/guides/runhawkbit/index.html
+++ b/guides/runhawkbit/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Run hawkBit - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -403,8 +403,7 @@
 		<div class="wrapper">
 			<h1>Run hawkBit </h1>
 
-			<p>In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.
-</p>
+			<p>In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.</p>
 
 <div class="admonition note">
 <p class="admonition-title"></p>
@@ -419,12 +418,9 @@
 <li>hawkBit <a href="https://github.com/eclipse/hawkbit/tree/master/hawkbit-runtime/hawkbit-update-server">Update Server</a>.</li>
 <li><a href="https://mariadb.org">MariaDB</a> for the repository.</li>
 <li><a href="https://www.rabbitmq.com">RabbitMQ</a> for DMF communication.</li>
-<li>For testing and demonstration purposes we will also use:
-
-<ul>
+<li>For testing and demonstration purposes we will also use:</li>
 <li><a href="https://github.com/eclipse/hawkbit-examples/tree/master/hawkbit-device-simulator">hawkBit Device Simulator</a>.</li>
 <li><a href="https://github.com/eclipse/hawkbit-examples/tree/master/hawkbit-mgmt-api-client">hawkBit Management API example client</a>.</li>
-</ul></li>
 </ul>
 
 <h2 id="prerequisites">Prerequisites</h2>
@@ -451,7 +447,7 @@
 
 <p>For this you can either edit the existing <em>application.properties</em> or create a <a href="http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-external-config-profile-specific-properties">new profile</a>.</p>
 
-<pre><code>spring.jpa.database=MYSQL
+<pre><code class="language-properties">spring.jpa.database=MYSQL
 spring.datasource.url=jdbc:mysql://localhost:3306/YOUR_SCHEMA
 spring.datasource.username=YOUR_USER
 spring.datasource.password=YOUR_PWD
@@ -462,7 +458,7 @@
 
 <p>We provide already defaults that should work with a standard Rabbit installation. Otherwise configure the following in the <code>application.properties</code> of the two services:</p>
 
-<pre><code>spring.rabbitmq.username=guest
+<pre><code class="language-properties">spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
 spring.rabbitmq.virtualHost=/
 spring.rabbitmq.host=localhost
@@ -475,31 +471,31 @@
 
 <p>Adapt <code>application.properties</code> in this case:</p>
 
-<pre><code>hawkbit.url=localhost:8080
+<pre><code class="language-properties">hawkbit.url=localhost:8080
 </code></pre>
 
 <p>or provide the parameter on command line:</p>
 
-<pre><code>hawkbit-example-mgmt-simulator-##VERSION##.jar --hawkbit.url=YOUR_HOST:PORT
+<pre><code class="language-properties">hawkbit-example-mgmt-simulator-##VERSION##.jar --hawkbit.url=YOUR_HOST:PORT
 </code></pre>
 
 <h2 id="compile-run">Compile &amp; Run</h2>
 
-<h3 id="compile-run-your-production-ready-app">Compile &amp; Run your <em>&ldquo;production ready&rdquo;</em> app.</h3>
+<h3 id="compile-run-your-production-ready-app">Compile &amp; Run your <em>&ldquo;production ready&rdquo;</em> app</h3>
 
 <p>see <a href="https://github.com/eclipse/hawkbit/tree/master/hawkbit-runtime/hawkbit-update-server">update server</a></p>
 
-<h3 id="compile-run-example-scenario-creation-script-https-github-com-eclipse-hawkbit-examples-tree-master-hawkbit-example-mgmt-simulator-optional">Compile &amp; Run example scenario <a href="https://github.com/eclipse/hawkbit-examples/tree/master/hawkbit-example-mgmt-simulator">creation script</a> (optional).</h3>
+<h3 id="compile-run-example-scenario-creation-script-https-github-com-eclipse-hawkbit-examples-tree-master-hawkbit-example-mgmt-simulator-optional">Compile &amp; Run example scenario <a href="https://github.com/eclipse/hawkbit-examples/tree/master/hawkbit-example-mgmt-simulator">creation script</a> (optional)</h3>
 
 <p>This has to be done before the device simulator is started. hawkBit creates the mandatory tenant metadata with first login into either <em>Management UI</em> or API (which is done by this client).</p>
 
 <p>However, this is not done by <em>DMF</em> which is in fact used by the device simulator, i.e. without calling <em>Management API</em> first hawkBit would drop all <em>DMF</em> messages as the tenant is unknown.</p>
 
-<h3 id="compile-run-device-simulator-optional">Compile &amp; Run device simulator (optional).</h3>
+<h3 id="compile-run-device-simulator-optional">Compile &amp; Run device simulator (optional)</h3>
 
 <p>see <a href="https://github.com/eclipse/hawkbit-examples/tree/master/hawkbit-device-simulator">device simulator</a></p>
 
-<h1 id="enjoy-hawkbit-with-a-real-database-artifact-storage-and-all-interfaces-apis-available">Enjoy hawkBit with a real database, artifact storage and all <a href="../../apis/">interfaces</a> available.</h1>
+<h1 id="enjoy-hawkbit-with-a-real-database-artifact-storage-and-all-interfaces-apis-available">Enjoy hawkBit with a real database, artifact storage and all <a href="../../apis/">interfaces</a> available</h1>
 
 <p><img src="../../images/hawkbit_ui.png" alt="" /></p>
 
@@ -511,7 +507,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/index.html b/index.html
index 5d7505b..f77fe29 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -471,7 +471,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/index.xml b/index.xml
index 95b91ab..18b7183 100644
--- a/index.xml
+++ b/index.xml
@@ -138,8 +138,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/runhawkbit/</guid>
-      <description>&lt;p&gt;In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the hawkBit example modules and update server.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -148,8 +147,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/feignclient/</guid>
-      <description>&lt;p&gt;In this guide we describe how to create a &lt;a href=&#34;https://github.com/Netflix/feign&#34;&gt;Feign&lt;/a&gt; Rest Client based on a  &lt;a href=&#34;http://projects.spring.io/spring-boot/&#34;&gt;Spring Boot&lt;/a&gt; Application.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;In this guide we describe how to create a &lt;a href=&#34;https://github.com/Netflix/feign&#34;&gt;Feign&lt;/a&gt; Rest Client based on a  &lt;a href=&#34;http://projects.spring.io/spring-boot/&#34;&gt;Spring Boot&lt;/a&gt; Application.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -158,8 +156,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/clustering/</guid>
-      <description>&lt;p&gt;hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md&#34;&gt;hawkBit runtimes&amp;rsquo;s README&lt;/a&gt;.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;hawkBit is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md&#34;&gt;hawkBit runtimes&amp;rsquo;s README&lt;/a&gt;.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -168,8 +165,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/guides/customtheme/</guid>
-      <description>&lt;p&gt;This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;This guide provides details about using and creating themes that control the visual look of Eclipse hawkBit Management UI. Theme customization is done using Sass, which is an extension of CSS (Cascading Style Sheets).&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -178,7 +174,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/features/</guid>
-      <description>Device and software repository  Repository that holds the provisioning targets and assignable software distributions. That includes a full software update history for every device. Support for pre-commission devices in the repository and plug and play, i.e. device is created if it is authenticated for the first time.  Update Management  Directly deploy a defined software distribution to a device (by Management UI or API). Update handling is independent of the device type, integration approach or connectivity.</description>
+      <description>Device and Software Repository  Repository that holds the provisioning targets and assignable software distributions. That includes a full software update history for every device. Support for pre-commission devices in the repository and plug and play, i.e. device is created if it is authenticated for the first time.  Update Management  Directly deploy a defined software distribution to a device (by Management UI or API). Update handling is independent of the device type, integration approach or connectivity.</description>
     </item>
     
     <item>
@@ -193,15 +189,8 @@
 &lt;li&gt;&lt;em&gt;Direct Device Integration (DDI) API&lt;/em&gt; by &lt;strong&gt;targets&lt;/strong&gt;.&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Management API&lt;/em&gt; by 3rd party &lt;strong&gt;applications&lt;/strong&gt;.&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Device Management Federation (DMF) API&lt;/em&gt; by 3rd party &lt;strong&gt;applications&lt;/strong&gt; through AMQP.&lt;/li&gt;
-&lt;li&gt;&lt;em&gt;Management UI&lt;/em&gt; by &lt;strong&gt;users&lt;/strong&gt;.
-&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h2 id=&#34;ddi-api-authentication-modes&#34;&gt;DDI API Authentication Modes&lt;/h2&gt;
-
-&lt;h3 id=&#34;security-token&#34;&gt;Security Token&lt;/h3&gt;
-
-&lt;p&gt;hawkBit supports multiple ways to authenticate a target against the server. The different authentication modes can be individual enabled and disabled within hawkBit. Both on system level (with Spring Boot properties) as per individual tenant.&lt;/p&gt;</description>
+&lt;li&gt;&lt;em&gt;Management UI&lt;/em&gt; by &lt;strong&gt;users&lt;/strong&gt;.&lt;/li&gt;
+&lt;/ul&gt;</description>
     </item>
     
     <item>
@@ -210,8 +199,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/authorization/</guid>
-      <description>&lt;p&gt;Authorization is handled separately for &lt;em&gt;Direct Device Integration (DDI) API&lt;/em&gt; and &lt;em&gt;Device Management Federation (DMF) API&lt;/em&gt; (where successful authentication includes full authorization) and &lt;em&gt;Management API&lt;/em&gt; and &lt;em&gt;UI&lt;/em&gt; which is based on Spring security &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java&#34;&gt;authorities&lt;/a&gt;.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;Authorization is handled separately for &lt;em&gt;Direct Device Integration (DDI) API&lt;/em&gt; and &lt;em&gt;Device Management Federation (DMF) API&lt;/em&gt; (where successful authentication includes full authorization) and &lt;em&gt;Management API&lt;/em&gt; and &lt;em&gt;UI&lt;/em&gt; which is based on Spring security &lt;a href=&#34;https://github.com/eclipse/hawkbit/blob/master/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java&#34;&gt;authorities&lt;/a&gt;.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -220,8 +208,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/datamodel/</guid>
-      <description>&lt;p&gt;The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;The hawkBit data model was designed to have enough flexibility to define complex software structures (e.g. operating system, runtimes, apps, different kind of artifacts) on one side and simplicity compared to the capabilities of a full blown configuration management on the other.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -230,8 +217,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/rollout-management/</guid>
-      <description>&lt;p&gt;Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;Software update operations in large scale IoT scenarios with hundreds of thousands of devices require special handling.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -240,8 +226,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/concepts/targetstate/</guid>
-      <description>&lt;p&gt;A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &amp;ldquo;I am here&amp;rdquo;, &amp;ldquo;I am working on a provisioning&amp;rdquo;, &amp;ldquo;I have finished a provisioning&amp;rdquo;.
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;A target has a current state which reflects the provisioning status of the device at this point in time. State changes are driven either by the update server by means of starting an update or by the controller on the provisioning target that gives feedback to the update server, e.g. &amp;ldquo;I am here&amp;rdquo;, &amp;ldquo;I am working on a provisioning&amp;rdquo;, &amp;ldquo;I have finished a provisioning&amp;rdquo;.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -269,8 +254,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/apis/management_api/</guid>
-      <description>&lt;p&gt;The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).
-&lt;/p&gt;</description>
+      <description>&lt;p&gt;The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -280,8 +264,7 @@
       
       <guid>https://www.eclipse.org/hawkbit/apis/ddi_api/</guid>
       <description>&lt;p&gt;The hawkBit &lt;a href=&#34;https://github.com/eclipse/hawkbit&#34;&gt;update server&lt;/a&gt; provides REST resources which are consumed by the device to retrieve software update tasks.
-This API is based on HTTP standards and a polling mechanism.
-&lt;/p&gt;</description>
+This API is based on HTTP standards and a polling mechanism.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -291,8 +274,7 @@
       
       <guid>https://www.eclipse.org/hawkbit/apis/dmf_api/</guid>
       <description>&lt;p&gt;The DMF API provides Java classes which allows that the message body can be deserialized at runtime into a Java object. Also Java classes can be used to serialize Java objects into JSON bodies to send a message to hawkBit.
-Currently, bodies of messages are based on JSON.
-&lt;/p&gt;</description>
+Currently, bodies of messages are based on JSON.&lt;/p&gt;</description>
     </item>
     
     <item>
@@ -311,14 +293,14 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://www.eclipse.org/hawkbit/release-notes/</guid>
-      <description>0.2.4 Release Date: Friday, October 26, 2018 Tag / Release
+      <description>0.2.5 Release Date: Friday, November 30, 2018 Tag / Release
+0.2.4 Release Date: Friday, October 26, 2018 Tag / Release
 0.2.3 Release Date: Monday, October 1, 2018 Tag / Release
 0.2.2 Release Date: Thursday, September 21, 2018 Tag / Release
 0.2.1 Release Date: Friday, July 6, 2018 Tag / Release
 0.2.0 First Eclipse hawkBit release including:
  Core features:
- Device and Software Repository Update Management Management UI/Console Artifact Content Delivery Rollout/Campaign Management  Interfaces:
- Management API Direct Device Integration (DDI) API Device Management Federation (DMF) API   Release Date: Friday, June 15, 2018 Tag / Release / Eclipse</description>
+ Device and Software Repository Update Management Management UI/Console Artifact Content Delivery Rollout/Campaign Management  Interfaces:</description>
     </item>
     
     <item>
diff --git a/news/2018-07-26-first-release/index.html b/news/2018-07-26-first-release/index.html
index 0f90542..342d558 100644
--- a/news/2018-07-26-first-release/index.html
+++ b/news/2018-07-26-first-release/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Eclipse hawkBit 0.2.0 - First Release - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -526,7 +526,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/news/index.html b/news/index.html
index 42f5f19..26a344c 100644
--- a/news/index.html
+++ b/news/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title> - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -426,7 +426,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/release-notes/index.html b/release-notes/index.html
index 3988866..0a628dc 100644
--- a/release-notes/index.html
+++ b/release-notes/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Release notes - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -475,7 +475,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/rest-api/distributionsets-api-guide/index.html b/rest-api/distributionsets-api-guide/index.html
index 2a99187..b009e27 100644
--- a/rest-api/distributionsets-api-guide/index.html
+++ b/rest-api/distributionsets-api-guide/index.html
@@ -457,7 +457,8 @@
 <h4 id="_curl"><a class="link" href="#_curl">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -604,7 +605,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">content[].requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -634,68 +635,68 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 2353
+Content-Length: 2339
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329405622,
+    "createdAt" : 1549349037237,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405624,
+    "lastModifiedAt" : 1549349037241,
     "name" : "DS",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
     "version" : "1.0",
     "modules" : [ {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329405614,
+      "createdAt" : 1549349037223,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329405632,
+      "lastModifiedAt" : 1549349037250,
       "name" : "Firmware",
-      "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-      "version" : "1.0.82",
+      "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+      "version" : "1.0.35",
       "type" : "os",
       "vendor" : "vendor Limited Inc, California",
       "deleted" : false,
       "_links" : {
         "self" : {
-          "href" : "https://management-api.host.com/rest/v1/softwaremodules/73"
+          "href" : "https://management-api.host.com/rest/v1/softwaremodules/202"
         }
       },
-      "id" : 73
+      "id" : 202
     }, {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329405606,
+      "createdAt" : 1549349037217,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329405628,
-      "name" : "application",
-      "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-      "version" : "1.0.71",
-      "type" : "application",
-      "vendor" : "vendor Limited, California",
-      "deleted" : false,
-      "_links" : {
-        "self" : {
-          "href" : "https://management-api.host.com/rest/v1/softwaremodules/71"
-        }
-      },
-      "id" : 71
-    }, {
-      "createdBy" : "bumlux",
-      "createdAt" : 1539329405610,
-      "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329405630,
+      "lastModifiedAt" : 1549349037247,
       "name" : "app runtime",
-      "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-      "version" : "1.0.76",
+      "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+      "version" : "1.0.88",
       "type" : "runtime",
       "vendor" : "vendor GmbH, Stuttgart, Germany",
       "deleted" : false,
       "_links" : {
         "self" : {
-          "href" : "https://management-api.host.com/rest/v1/softwaremodules/72"
+          "href" : "https://management-api.host.com/rest/v1/softwaremodules/201"
         }
       },
-      "id" : 72
+      "id" : 201
+    }, {
+      "createdBy" : "bumlux",
+      "createdAt" : 1549349037212,
+      "lastModifiedBy" : "bumlux",
+      "lastModifiedAt" : 1549349037253,
+      "name" : "application",
+      "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+      "version" : "1.0.78",
+      "type" : "application",
+      "vendor" : "vendor Limited, California",
+      "deleted" : false,
+      "_links" : {
+        "self" : {
+          "href" : "https://management-api.host.com/rest/v1/softwaremodules/200"
+        }
+      },
+      "id" : 200
     } ],
     "requiredMigrationStep" : false,
     "type" : "test_default_ds_type",
@@ -703,10 +704,10 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/distributionsets/27"
+        "href" : "https://management-api.host.com/rest/v1/distributionsets/65"
       }
     },
-    "id" : 27
+    "id" : 65
   } ],
   "total" : 1,
   "size" : 1
@@ -781,38 +782,40 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "requiredMigrationStep" : false,
   "name" : "one",
-  "description" : "sem ut leo dui fringilla facilisi montes convallis nullam tempus",
+  "description" : "lobortis class est in fames a porta est nascetur sapien",
   "type" : "test_default_ds_type",
   "version" : "one",
   "modules" : [ {
-    "id" : 69
+    "id" : 199
   }, {
-    "id" : 70
+    "id" : 198
   } ]
 }, {
   "requiredMigrationStep" : false,
   "name" : "two",
-  "description" : "luctus ornare sapien dictum etiam luctus class lectus risus purus",
+  "description" : "curabitur montes tempor venenatis vehicula vivamus eget maecenas scelerisque dignissim",
   "type" : "test_default_ds_type",
   "version" : "two",
   "modules" : [ {
-    "id" : 69
+    "id" : 199
   }, {
-    "id" : 70
+    "id" : 198
   } ]
 }, {
   "requiredMigrationStep" : true,
   "name" : "three",
-  "description" : "suspendisse ultrices commodo consectetur luctus ridiculus molestie gravida blandit eu",
+  "description" : "class viverra aenean sollicitudin torquent magnis sapien dictumst faucibus sapien",
   "type" : "test_default_ds_type",
   "version" : "three",
   "modules" : [ {
-    "id" : 69
+    "id" : 199
   }, {
-    "id" : 70
+    "id" : 198
   } ]
 } ]'</code></pre>
 </div>
@@ -823,42 +826,42 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/ HTTP/1.1
+Content-Length: 818
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 804
 
 [ {
   "requiredMigrationStep" : false,
   "name" : "one",
-  "description" : "sem ut leo dui fringilla facilisi montes convallis nullam tempus",
+  "description" : "lobortis class est in fames a porta est nascetur sapien",
   "type" : "test_default_ds_type",
   "version" : "one",
   "modules" : [ {
-    "id" : 69
+    "id" : 199
   }, {
-    "id" : 70
+    "id" : 198
   } ]
 }, {
   "requiredMigrationStep" : false,
   "name" : "two",
-  "description" : "luctus ornare sapien dictum etiam luctus class lectus risus purus",
+  "description" : "curabitur montes tempor venenatis vehicula vivamus eget maecenas scelerisque dignissim",
   "type" : "test_default_ds_type",
   "version" : "two",
   "modules" : [ {
-    "id" : 69
+    "id" : 199
   }, {
-    "id" : 70
+    "id" : 198
   } ]
 }, {
   "requiredMigrationStep" : true,
   "name" : "three",
-  "description" : "suspendisse ultrices commodo consectetur luctus ridiculus molestie gravida blandit eu",
+  "description" : "class viverra aenean sollicitudin torquent magnis sapien dictumst faucibus sapien",
   "type" : "test_default_ds_type",
   "version" : "three",
   "modules" : [ {
-    "id" : 69
+    "id" : 199
   }, {
-    "id" : 70
+    "id" : 198
   } ]
 } ]</code></pre>
 </div>
@@ -908,7 +911,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">[]requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
@@ -994,7 +997,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">[]requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1023,51 +1026,51 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Content-Length: 4676
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 4626
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329405518,
+  "createdAt" : 1549349037041,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329405518,
+  "lastModifiedAt" : 1549349037041,
   "name" : "one",
-  "description" : "sem ut leo dui fringilla facilisi montes convallis nullam tempus",
+  "description" : "lobortis class est in fames a porta est nascetur sapien",
   "version" : "one",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329405489,
+    "createdAt" : 1549349037012,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405489,
-    "name" : "application",
-    "description" : "rutrum venenatis platea purus pretium fermentum convallis hac convallis ipsum",
-    "version" : "1.0",
-    "type" : "application",
-    "vendor" : "Vendor Limited, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/69"
-      }
-    },
-    "id" : 69
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329405493,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405493,
+    "lastModifiedAt" : 1549349037012,
     "name" : "os",
-    "description" : "congue quam enim a sociis potenti ipsum turpis aenean enim",
+    "description" : "sit velit ullamcorper massa sit scelerisque ligula fames ullamcorper elit",
     "version" : "1.0",
     "type" : "os",
     "vendor" : "Vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/70"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/199"
       }
     },
-    "id" : 70
+    "id" : 199
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349037008,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349037008,
+    "name" : "application",
+    "description" : "tristique curabitur accumsan dis integer facilisis nibh leo platea donec",
+    "version" : "1.0",
+    "type" : "application",
+    "vendor" : "Vendor Limited, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/198"
+      }
+    },
+    "id" : 198
   } ],
   "requiredMigrationStep" : false,
   "type" : "test_default_ds_type",
@@ -1075,52 +1078,52 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/24"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/62"
     }
   },
-  "id" : 24
+  "id" : 62
 }, {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329405520,
+  "createdAt" : 1549349037044,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329405520,
+  "lastModifiedAt" : 1549349037044,
   "name" : "two",
-  "description" : "luctus ornare sapien dictum etiam luctus class lectus risus purus",
+  "description" : "curabitur montes tempor venenatis vehicula vivamus eget maecenas scelerisque dignissim",
   "version" : "two",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329405489,
+    "createdAt" : 1549349037012,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405489,
-    "name" : "application",
-    "description" : "rutrum venenatis platea purus pretium fermentum convallis hac convallis ipsum",
-    "version" : "1.0",
-    "type" : "application",
-    "vendor" : "Vendor Limited, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/69"
-      }
-    },
-    "id" : 69
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329405493,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405493,
+    "lastModifiedAt" : 1549349037012,
     "name" : "os",
-    "description" : "congue quam enim a sociis potenti ipsum turpis aenean enim",
+    "description" : "sit velit ullamcorper massa sit scelerisque ligula fames ullamcorper elit",
     "version" : "1.0",
     "type" : "os",
     "vendor" : "Vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/70"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/199"
       }
     },
-    "id" : 70
+    "id" : 199
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349037008,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349037008,
+    "name" : "application",
+    "description" : "tristique curabitur accumsan dis integer facilisis nibh leo platea donec",
+    "version" : "1.0",
+    "type" : "application",
+    "vendor" : "Vendor Limited, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/198"
+      }
+    },
+    "id" : 198
   } ],
   "requiredMigrationStep" : false,
   "type" : "test_default_ds_type",
@@ -1128,52 +1131,52 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/25"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/64"
     }
   },
-  "id" : 25
+  "id" : 64
 }, {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329405522,
+  "createdAt" : 1549349037047,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329405522,
+  "lastModifiedAt" : 1549349037047,
   "name" : "three",
-  "description" : "suspendisse ultrices commodo consectetur luctus ridiculus molestie gravida blandit eu",
+  "description" : "class viverra aenean sollicitudin torquent magnis sapien dictumst faucibus sapien",
   "version" : "three",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329405489,
+    "createdAt" : 1549349037012,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405489,
-    "name" : "application",
-    "description" : "rutrum venenatis platea purus pretium fermentum convallis hac convallis ipsum",
-    "version" : "1.0",
-    "type" : "application",
-    "vendor" : "Vendor Limited, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/69"
-      }
-    },
-    "id" : 69
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329405493,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329405493,
+    "lastModifiedAt" : 1549349037012,
     "name" : "os",
-    "description" : "congue quam enim a sociis potenti ipsum turpis aenean enim",
+    "description" : "sit velit ullamcorper massa sit scelerisque ligula fames ullamcorper elit",
     "version" : "1.0",
     "type" : "os",
     "vendor" : "Vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/70"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/199"
       }
     },
-    "id" : 70
+    "id" : 199
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349037008,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349037008,
+    "name" : "application",
+    "description" : "tristique curabitur accumsan dis integer facilisis nibh leo platea donec",
+    "version" : "1.0",
+    "type" : "application",
+    "vendor" : "Vendor Limited, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/198"
+      }
+    },
+    "id" : 198
   } ],
   "requiredMigrationStep" : true,
   "type" : "test_default_ds_type",
@@ -1181,10 +1184,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/26"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/63"
     }
   },
-  "id" : 26
+  "id" : 63
 } ]</code></pre>
 </div>
 </div>
@@ -1266,7 +1269,7 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/9' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/47' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -1274,7 +1277,7 @@
 <h4 id="_request_url_3"><a class="link" href="#_request_url_3">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsets/9 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsets/47 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -1383,7 +1386,8 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/5' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/43' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -1391,7 +1395,7 @@
 <h4 id="_request_url_4"><a class="link" href="#_request_url_4">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/5 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/43 HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -1490,7 +1494,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1537,68 +1541,68 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 2581
 Content-Type: application/json;charset=UTF-8
-Content-Length: 2590
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329403645,
+  "createdAt" : 1549349034449,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329403648,
+  "lastModifiedAt" : 1549349034455,
   "name" : "DS",
-  "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
+  "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
   "version" : "1.0",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329403636,
+    "createdAt" : 1549349034425,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329403656,
-    "name" : "Firmware",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.21",
-    "type" : "os",
-    "vendor" : "vendor Limited Inc, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/15"
-      }
-    },
-    "id" : 15
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329403630,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329403652,
+    "lastModifiedAt" : 1549349034464,
     "name" : "application",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.73",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.29",
     "type" : "application",
     "vendor" : "vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/13"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/142"
       }
     },
-    "id" : 13
+    "id" : 142
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329403633,
+    "createdAt" : 1549349034436,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329403654,
+    "lastModifiedAt" : 1549349034460,
+    "name" : "Firmware",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.40",
+    "type" : "os",
+    "vendor" : "vendor Limited Inc, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/144"
+      }
+    },
+    "id" : 144
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349034432,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349034467,
     "name" : "app runtime",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.94",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.41",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/14"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/143"
       }
     },
-    "id" : 14
+    "id" : 143
   } ],
   "requiredMigrationStep" : false,
   "type" : "test_default_ds_type",
@@ -1606,21 +1610,21 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/43"
     },
     "modules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5/assignedSM?offset=0&amp;limit=50{&amp;sort}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/43/assignedSM?offset=0&amp;limit=50{&amp;sort}",
       "templated" : true
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/20"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/232"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/43/metadata?offset=0&amp;limit=50{&amp;sort,q}",
       "templated" : true
     }
   },
-  "id" : 5
+  "id" : 43
 }</code></pre>
 </div>
 </div>
@@ -1697,7 +1701,10 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/11' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept: application/json' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/49' -i -X PUT \
+    -H 'Accept: application/json' \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "requiredMigrationStep" : true,
   "name" : "another Name",
   "description" : "a new description",
@@ -1710,11 +1717,11 @@
 <h4 id="_request_url_5"><a class="link" href="#_request_url_5">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsets/11 HTTP/1.1
-Content-Type: application/json;charset=UTF-8
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsets/49 HTTP/1.1
 Accept: application/json
-Host: management-api.host.com
+Content-Type: application/json;charset=UTF-8
 Content-Length: 135
+Host: management-api.host.com
 
 {
   "requiredMigrationStep" : true,
@@ -1790,7 +1797,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
@@ -1869,7 +1876,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1916,68 +1923,68 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 2534
 Content-Type: application/json;charset=UTF-8
-Content-Length: 2542
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329404109,
+  "createdAt" : 1549349035225,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329404127,
+  "lastModifiedAt" : 1549349035250,
   "name" : "another Name",
   "description" : "a new description",
   "version" : "another Version",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404097,
+    "createdAt" : 1549349035207,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404116,
+    "lastModifiedAt" : 1549349035239,
     "name" : "app runtime",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.29",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.55",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/32"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/161"
       }
     },
-    "id" : 32
+    "id" : 161
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404101,
+    "createdAt" : 1549349035203,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404118,
-    "name" : "Firmware",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.21",
-    "type" : "os",
-    "vendor" : "vendor Limited Inc, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/33"
-      }
-    },
-    "id" : 33
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329404094,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404114,
+    "lastModifiedAt" : 1549349035236,
     "name" : "application",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.32",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.76",
     "type" : "application",
     "vendor" : "vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/31"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/160"
       }
     },
-    "id" : 31
+    "id" : 160
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349035212,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349035233,
+    "name" : "Firmware",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.91",
+    "type" : "os",
+    "vendor" : "vendor Limited Inc, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/162"
+      }
+    },
+    "id" : 162
   } ],
   "requiredMigrationStep" : true,
   "type" : "test_default_ds_type",
@@ -1985,21 +1992,21 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/11"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/49"
     },
     "modules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/11/assignedSM?offset=0&amp;limit=50{&amp;sort}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/49/assignedSM?offset=0&amp;limit=50{&amp;sort}",
       "templated" : true
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/36"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/248"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/11/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/49/metadata?offset=0&amp;limit=50{&amp;sort,q}",
       "templated" : true
     }
   },
-  "id" : 11
+  "id" : 49
 }</code></pre>
 </div>
 </div>
@@ -2086,7 +2093,8 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/17/assignedSM' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/55/assignedSM' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -2094,7 +2102,7 @@
 <h4 id="_request_url_6"><a class="link" href="#_request_url_6">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/17/assignedSM HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/55/assignedSM HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -2158,7 +2166,7 @@
 <h4 id="_request_parameter_example"><a class="link" href="#_request_parameter_example">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/12/assignedSM?offset=1&amp;limit=2&amp;sort=version%3ADESC&amp;q=name%3D%3Done* HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/50/assignedSM?offset=1&amp;limit=2&amp;sort=version%3ADESC&amp;q=name%3D%3Done* HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -2271,61 +2279,61 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 1665
 Content-Type: application/json;charset=UTF-8
-Content-Length: 1673
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404811,
+    "createdAt" : 1549349036097,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404832,
+    "lastModifiedAt" : 1549349036128,
     "name" : "application",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.88",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.98",
     "type" : "application",
     "vendor" : "vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/49"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/178"
       }
     },
-    "id" : 49
+    "id" : 178
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404813,
+    "createdAt" : 1549349036102,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404833,
+    "lastModifiedAt" : 1549349036123,
     "name" : "app runtime",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.8",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.69",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/50"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/179"
       }
     },
-    "id" : 50
+    "id" : 179
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404816,
+    "createdAt" : 1549349036106,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404835,
+    "lastModifiedAt" : 1549349036125,
     "name" : "Firmware",
-    "description" : "Updated Desc: elementum curae ligula netus class tincidunt suscipit commodo aliquet turpis",
-    "version" : "1.0.32",
+    "description" : "Updated Desc: nam risus curae taciti turpis pellentesque ultricies nostra cum aliquam",
+    "version" : "1.0.72",
     "type" : "os",
     "vendor" : "vendor Limited Inc, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/51"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/180"
       }
     },
-    "id" : 51
+    "id" : 180
   } ],
   "total" : 3,
   "size" : 3
@@ -2400,10 +2408,12 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/19/assignedSM' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
-  "id" : 55
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/57/assignedSM' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
+  "id" : 184
 }, {
-  "id" : 56
+  "id" : 185
 } ]'</code></pre>
 </div>
 </div>
@@ -2412,15 +2422,15 @@
 <h4 id="_request_url_7"><a class="link" href="#_request_url_7">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/19/assignedSM HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/57/assignedSM HTTP/1.1
+Content-Length: 38
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 36
 
 [ {
-  "id" : 55
+  "id" : 184
 }, {
-  "id" : 56
+  "id" : 185
 } ]</code></pre>
 </div>
 </div>
@@ -2569,7 +2579,8 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/4/assignedSM/12' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/42/assignedSM/141' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -2577,7 +2588,7 @@
 <h4 id="_request_url_8"><a class="link" href="#_request_url_8">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsets/4/assignedSM/12 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsets/42/assignedSM/141 HTTP/1.1
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com</code></pre>
 </div>
@@ -2691,7 +2702,8 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/3/assignedTargets' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/41/assignedTargets' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -2699,7 +2711,7 @@
 <h4 id="_request_url_9"><a class="link" href="#_request_url_9">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/3/assignedTargets HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/41/assignedTargets HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -2763,7 +2775,7 @@
 <h4 id="_request_parameter_example_2"><a class="link" href="#_request_parameter_example_2">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/10/assignedTargets?offset=1&amp;limit=2&amp;sort=name%3ADESC&amp;q=controllerId%3D%3Dtarget* HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/48/assignedTargets?offset=1&amp;limit=2&amp;sort=name%3ADESC&amp;q=controllerId%3D%3Dtarget* HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -2816,19 +2828,19 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
 Content-Length: 501
+Content-Type: application/json;charset=UTF-8
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329403333,
+    "createdAt" : 1549349033978,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329403430,
+    "lastModifiedAt" : 1549349034153,
     "name" : "targetExist",
     "controllerId" : "targetExist",
     "updateStatus" : "pending",
-    "securityToken" : "f8458d40699ad913de6f86abfad62641",
+    "securityToken" : "604b439f2ce3c3fdab072b529124c1dc",
     "requestAttributes" : true,
     "_links" : {
       "self" : {
@@ -2909,49 +2921,51 @@
 <h4 id="_curl_10"><a class="link" href="#_curl_10">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/16/assignedTargets' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/54/assignedTargets' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target1",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target2",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target3",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target4",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target5",
   "type" : "timeforced"
 } ]'</code></pre>
@@ -2962,54 +2976,54 @@
 <h4 id="_request_url_10"><a class="link" href="#_request_url_10">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/16/assignedTargets HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/54/assignedTargets HTTP/1.1
+Content-Length: 1027
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 1032
 
 [ {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target1",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target2",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target3",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target4",
   "type" : "timeforced"
 }, {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "55 23 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329404632,
+  "forcetime" : 1549349035906,
   "id" : "target5",
   "type" : "timeforced"
 } ]</code></pre>
@@ -3177,8 +3191,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 60
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "assigned" : 4,
@@ -3270,7 +3284,8 @@
 <h4 id="_curl_11"><a class="link" href="#_curl_11">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/18/installedTargets' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/56/installedTargets' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -3278,7 +3293,7 @@
 <h4 id="_request_url_11"><a class="link" href="#_request_url_11">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/18/installedTargets HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/56/installedTargets HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -3342,7 +3357,7 @@
 <h4 id="_request_parameter_example_3"><a class="link" href="#_request_parameter_example_3">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/2/installedTargets?offset=1&amp;limit=2&amp;sort=name%3ADESC&amp;q=controllerId%3D%3Dtarget* HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/40/installedTargets?offset=1&amp;limit=2&amp;sort=name%3ADESC&amp;q=controllerId%3D%3Dtarget* HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -3395,20 +3410,20 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
 Content-Length: 536
+Content-Type: application/json;charset=UTF-8
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404932,
+    "createdAt" : 1549349036268,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404949,
+    "lastModifiedAt" : 1549349036286,
     "name" : "targetExist",
     "controllerId" : "targetExist",
     "updateStatus" : "in_sync",
-    "installedAt" : 1539329404947,
-    "securityToken" : "67b02f5aa974955eca4fdff2d49c3aa0",
+    "installedAt" : 1549349036283,
+    "securityToken" : "f7b54575a35cc2457576329988dcd5e3",
     "requestAttributes" : true,
     "_links" : {
       "self" : {
@@ -3489,7 +3504,8 @@
 <h4 id="_curl_12"><a class="link" href="#_curl_12">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/15/autoAssignTargetFilters' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/53/autoAssignTargetFilters' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -3497,7 +3513,7 @@
 <h4 id="_request_url_12"><a class="link" href="#_request_url_12">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/15/autoAssignTargetFilters HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/53/autoAssignTargetFilters HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -3561,7 +3577,7 @@
 <h4 id="_request_parameter_example_4"><a class="link" href="#_request_parameter_example_4">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/1/autoAssignTargetFilters?offset=1&amp;limit=2&amp;sort=name%3ADESC&amp;q=name%3D%3D*1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/39/autoAssignTargetFilters?offset=1&amp;limit=2&amp;sort=name%3ADESC&amp;q=name%3D%3D*1 HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -3614,38 +3630,38 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 779
 Content-Type: application/json;charset=UTF-8
-Content-Length: 775
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404526,
+    "createdAt" : 1549349035779,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404526,
+    "lastModifiedAt" : 1549349035779,
     "name" : "filter1",
     "query" : "name==a",
-    "autoAssignDistributionSet" : 15,
+    "autoAssignDistributionSet" : 53,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/targetfilters/2"
+        "href" : "https://management-api.host.com/rest/v1/targetfilters/10"
       }
     },
-    "id" : 2
+    "id" : 10
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329404529,
+    "createdAt" : 1549349035783,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329404529,
+    "lastModifiedAt" : 1549349035783,
     "name" : "filter2",
     "query" : "name==b",
-    "autoAssignDistributionSet" : 15,
+    "autoAssignDistributionSet" : 53,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/targetfilters/3"
+        "href" : "https://management-api.host.com/rest/v1/targetfilters/11"
       }
     },
-    "id" : 3
+    "id" : 11
   } ],
   "total" : 2,
   "size" : 2
@@ -3720,7 +3736,7 @@
 <h4 id="_curl_13"><a class="link" href="#_curl_13">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/22/metadata' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/60/metadata' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -3728,7 +3744,7 @@
 <h4 id="_request_url_13"><a class="link" href="#_request_url_13">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/22/metadata HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/60/metadata HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -3791,7 +3807,7 @@
 <h4 id="_request_parameter_example_5"><a class="link" href="#_request_parameter_example_5">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/21/metadata?offset=1&amp;limit=2&amp;sort=key%3ADESC&amp;q=key%3D%3Dknown* HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/59/metadata?offset=1&amp;limit=2&amp;sort=key%3ADESC&amp;q=key%3D%3Dknown* HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -3945,7 +3961,9 @@
 <h4 id="_curl_14"><a class="link" href="#_curl_14">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/14/metadata' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/52/metadata' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "value" : "knownValue1",
   "key" : "knownKey1"
 }, {
@@ -3959,10 +3977,10 @@
 <h4 id="_request_url_14"><a class="link" href="#_request_url_14">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/14/metadata HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsets/52/metadata HTTP/1.1
+Content-Length: 110
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 110
 
 [ {
   "value" : "knownValue1",
@@ -4040,8 +4058,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 110
+Content-Type: application/hal+json;charset=UTF-8
 
 [ {
   "key" : "knownKey1",
@@ -4135,7 +4153,7 @@
 <h4 id="_curl_15"><a class="link" href="#_curl_15">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/23/metadata/knownKey' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/61/metadata/knownKey' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -4143,7 +4161,7 @@
 <h4 id="_request_url_15"><a class="link" href="#_request_url_15">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsets/23/metadata/knownKey HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsets/61/metadata/knownKey HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -4256,7 +4274,7 @@
 <h4 id="_curl_16"><a class="link" href="#_curl_16">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/20/metadata/knownKey' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/58/metadata/knownKey' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -4264,7 +4282,7 @@
 <h4 id="_request_url_16"><a class="link" href="#_request_url_16">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/20/metadata/knownKey HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsets/58/metadata/knownKey HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -4335,8 +4353,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
 Content-Length: 50
+Content-Type: application/json;charset=UTF-8
 
 {
   "key" : "knownKey",
@@ -4412,7 +4430,9 @@
 <h4 id="_curl_17"><a class="link" href="#_curl_17">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/13/metadata/knownKey' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsets/51/metadata/knownKey' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "value" : "valueForUpdate",
   "key" : "knownKey"
 }'</code></pre>
@@ -4423,10 +4443,10 @@
 <h4 id="_request_url_17"><a class="link" href="#_request_url_17">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsets/13/metadata/knownKey HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsets/51/metadata/knownKey HTTP/1.1
+Content-Length: 54
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 54
 
 {
   "value" : "valueForUpdate",
@@ -4538,8 +4558,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 54
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "key" : "knownKey",
diff --git a/rest-api/distributionsettag-api-guide/index.html b/rest-api/distributionsettag-api-guide/index.html
index b7d1f48..faa9327 100644
--- a/rest-api/distributionsettag-api-guide/index.html
+++ b/rest-api/distributionsettag-api-guide/index.html
@@ -449,7 +449,7 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -608,9 +608,9 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329367792,
+    "createdAt" : 1549348990657,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329367800,
+    "lastModifiedAt" : 1549348990669,
     "name" : "DsTag",
     "description" : "My name is DsTag",
     "colour" : "default",
@@ -694,7 +694,7 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/6' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/6' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -819,9 +819,9 @@
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329369023,
+  "createdAt" : 1549348992587,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329369029,
+  "lastModifiedAt" : 1549348992595,
   "name" : "DsTag",
   "description" : "My name is DsTag",
   "colour" : "default",
@@ -906,7 +906,9 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "colour" : "red",
   "name" : "ds tag",
   "description" : "ds tag description"
@@ -919,9 +921,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettags HTTP/1.1
+Content-Length: 87
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 87
 
 [ {
   "colour" : "red",
@@ -1057,9 +1059,9 @@
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329369252,
+  "createdAt" : 1549348992898,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329369252,
+  "lastModifiedAt" : 1549348992898,
   "name" : "ds tag",
   "description" : "ds tag description",
   "colour" : "red",
@@ -1150,7 +1152,9 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/1' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/1' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "colour" : "red",
   "name" : "ds tag",
   "description" : "ds tag description"
@@ -1163,9 +1167,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsettags/1 HTTP/1.1
+Content-Length: 83
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 83
 
 {
   "colour" : "red",
@@ -1328,9 +1332,9 @@
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329367103,
+  "createdAt" : 1549348989296,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329367242,
+  "lastModifiedAt" : 1549348989634,
   "name" : "ds tag",
   "description" : "ds tag description",
   "colour" : "red",
@@ -1430,7 +1434,8 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/4' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/4' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -1558,7 +1563,8 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/3/assigned' -i -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/3/assigned' -i -X GET \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -1665,7 +1671,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">content[].requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1718,20 +1724,20 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329368052,
+    "createdAt" : 1549348991047,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329368174,
+    "lastModifiedAt" : 1549348991212,
     "name" : "DS",
     "description" : "The descption of the distribution set.",
     "version" : "1.0",
     "modules" : [ {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329368014,
+      "createdAt" : 1549348990998,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329368122,
+      "lastModifiedAt" : 1549348991130,
       "name" : "app runtime",
       "description" : "Description of the software module",
-      "version" : "1.0.80",
+      "version" : "1.0.58",
       "type" : "runtime",
       "vendor" : "vendor GmbH, Stuttgart, Germany",
       "deleted" : false,
@@ -1743,12 +1749,12 @@
       "id" : 8
     }, {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329368004,
+      "createdAt" : 1549348990984,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329368138,
+      "lastModifiedAt" : 1549348991156,
       "name" : "application",
       "description" : "Description of the software module",
-      "version" : "1.0.81",
+      "version" : "1.0.26",
       "type" : "application",
       "vendor" : "vendor Limited, California",
       "deleted" : false,
@@ -1760,12 +1766,12 @@
       "id" : 7
     }, {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329368025,
+      "createdAt" : 1549348991013,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329368103,
+      "lastModifiedAt" : 1549348991098,
       "name" : "Firmware",
       "description" : "Description of the software module",
-      "version" : "1.0.91",
+      "version" : "1.0.95",
       "type" : "os",
       "vendor" : "vendor Limited Inc, California",
       "deleted" : false,
@@ -1865,7 +1871,9 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/9/assigned/toggleTagAssignment' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/9/assigned/toggleTagAssignment' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "id" : 9
 } ]'</code></pre>
 </div>
@@ -1876,9 +1884,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettags/9/assigned/toggleTagAssignment HTTP/1.1
+Content-Length: 18
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 18
 
 [ {
   "id" : 9
@@ -1958,78 +1966,94 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 2157
+Content-Length: 2645
 
 {
   "assignedDistributionSets" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329369706,
+    "createdAt" : 1549348993438,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329369828,
+    "lastModifiedAt" : 1549348993592,
     "name" : "DS",
     "description" : "The descption of the distribution set.",
     "version" : "1.0",
     "modules" : [ {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329369687,
+      "createdAt" : 1549348993420,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329369759,
+      "lastModifiedAt" : 1549348993498,
       "name" : "Firmware",
       "description" : "Description of the software module",
-      "version" : "1.0.57",
+      "version" : "1.0.82",
       "type" : "os",
       "vendor" : "vendor Limited Inc, California",
       "deleted" : false,
-      "_links" : {
-        "self" : {
-          "href" : "https://management-api.host.com/rest/v1/softwaremodules/27"
-        }
-      },
+      "links" : [ {
+        "rel" : "self",
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/27",
+        "hreflang" : null,
+        "media" : null,
+        "title" : null,
+        "type" : null,
+        "deprecation" : null
+      } ],
       "id" : 27
     }, {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329369671,
+      "createdAt" : 1549348993405,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329369731,
+      "lastModifiedAt" : 1549348993467,
       "name" : "application",
       "description" : "Description of the software module",
-      "version" : "1.0.60",
+      "version" : "1.0.68",
       "type" : "application",
       "vendor" : "vendor Limited, California",
       "deleted" : false,
-      "_links" : {
-        "self" : {
-          "href" : "https://management-api.host.com/rest/v1/softwaremodules/25"
-        }
-      },
+      "links" : [ {
+        "rel" : "self",
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/25",
+        "hreflang" : null,
+        "media" : null,
+        "title" : null,
+        "type" : null,
+        "deprecation" : null
+      } ],
       "id" : 25
     }, {
       "createdBy" : "bumlux",
-      "createdAt" : 1539329369679,
+      "createdAt" : 1549348993413,
       "lastModifiedBy" : "bumlux",
-      "lastModifiedAt" : 1539329369745,
+      "lastModifiedAt" : 1549348993481,
       "name" : "app runtime",
       "description" : "Description of the software module",
-      "version" : "1.0.89",
+      "version" : "1.0.41",
       "type" : "runtime",
       "vendor" : "vendor GmbH, Stuttgart, Germany",
       "deleted" : false,
-      "_links" : {
-        "self" : {
-          "href" : "https://management-api.host.com/rest/v1/softwaremodules/26"
-        }
-      },
+      "links" : [ {
+        "rel" : "self",
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/26",
+        "hreflang" : null,
+        "media" : null,
+        "title" : null,
+        "type" : null,
+        "deprecation" : null
+      } ],
       "id" : 26
     } ],
     "requiredMigrationStep" : false,
     "type" : "test_default_ds_type",
     "complete" : true,
     "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/distributionsets/9"
-      }
-    },
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/9",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ],
     "id" : 9
   } ],
   "unassignedDistributionSets" : [ ]
@@ -2114,7 +2138,9 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/8/assigned' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/8/assigned' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "id" : 8
 } ]'</code></pre>
 </div>
@@ -2125,9 +2151,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettags/8/assigned HTTP/1.1
+Content-Length: 18
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 18
 
 [ {
   "id" : 8
@@ -2237,7 +2263,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">[]requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -2271,20 +2297,20 @@
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329369416,
+  "createdAt" : 1549348993117,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329369503,
+  "lastModifiedAt" : 1549348993224,
   "name" : "DS",
   "description" : "The descption of the distribution set.",
   "version" : "1.0",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329369399,
+    "createdAt" : 1549348993090,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329369451,
+    "lastModifiedAt" : 1549348993167,
     "name" : "Firmware",
     "description" : "Description of the software module",
-    "version" : "1.0.56",
+    "version" : "1.0.81",
     "type" : "os",
     "vendor" : "vendor Limited Inc, California",
     "deleted" : false,
@@ -2296,12 +2322,12 @@
     "id" : 24
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329369388,
+    "createdAt" : 1549348993073,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329369468,
+    "lastModifiedAt" : 1549348993185,
     "name" : "application",
     "description" : "Description of the software module",
-    "version" : "1.0.73",
+    "version" : "1.0.14",
     "type" : "application",
     "vendor" : "vendor Limited, California",
     "deleted" : false,
@@ -2313,12 +2339,12 @@
     "id" : 22
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329369393,
+    "createdAt" : 1549348993081,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329369438,
+    "lastModifiedAt" : 1549348993153,
     "name" : "app runtime",
     "description" : "Description of the software module",
-    "version" : "1.0.28",
+    "version" : "1.0.12",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
@@ -2420,7 +2446,8 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/10/assigned/11' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettags/10/assigned/11' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
diff --git a/rest-api/distributionsettypes-api-guide/index.html b/rest-api/distributionsettypes-api-guide/index.html
index 2219332..b64308f 100644
--- a/rest-api/distributionsettypes-api-guide/index.html
+++ b/rest-api/distributionsettypes-api-guide/index.html
@@ -454,7 +454,8 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -607,69 +608,69 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 1748
+Content-Length: 1756
 
 {
   "content" : [ {
     "createdBy" : "system",
-    "createdAt" : 1539329418406,
+    "createdAt" : 1549349055410,
     "lastModifiedBy" : "system",
-    "lastModifiedAt" : 1539329418406,
-    "name" : "OS with app(s)",
-    "description" : "Default type with Firmware/OS and optional app(s).",
-    "key" : "os_app",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/15"
-      }
-    },
-    "id" : 15
-  }, {
-    "createdBy" : "system",
-    "createdAt" : 1539329418405,
-    "lastModifiedBy" : "system",
-    "lastModifiedAt" : 1539329418405,
-    "name" : "OS only",
-    "description" : "Default type with Firmware/OS only.",
-    "key" : "os",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/16"
-      }
-    },
-    "id" : 16
-  }, {
-    "createdBy" : "system",
-    "createdAt" : 1539329418405,
-    "lastModifiedBy" : "system",
-    "lastModifiedAt" : 1539329418405,
+    "lastModifiedAt" : 1549349055410,
     "name" : "App(s) only",
     "description" : "Default type with app(s) only.",
     "key" : "app",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/17"
+        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/423"
       }
     },
-    "id" : 17
+    "id" : 423
+  }, {
+    "createdBy" : "system",
+    "createdAt" : 1549349055411,
+    "lastModifiedBy" : "system",
+    "lastModifiedAt" : 1549349055411,
+    "name" : "OS with app(s)",
+    "description" : "Default type with Firmware/OS and optional app(s).",
+    "key" : "os_app",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/424"
+      }
+    },
+    "id" : 424
+  }, {
+    "createdBy" : "system",
+    "createdAt" : 1549349055409,
+    "lastModifiedBy" : "system",
+    "lastModifiedAt" : 1549349055409,
+    "name" : "OS only",
+    "description" : "Default type with Firmware/OS only.",
+    "key" : "os",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/425"
+      }
+    },
+    "id" : 425
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329418424,
+    "createdAt" : 1549349055438,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329418461,
+    "lastModifiedAt" : 1549349055484,
     "name" : "OS (FW) mandatory, runtime (FW) and app (SW) optional",
     "description" : "Desc1234",
     "key" : "test_default_ds_type",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/18"
+        "href" : "https://management-api.host.com/rest/v1/distributionsettypes/426"
       }
     },
-    "id" : 18
+    "id" : 426
   } ],
   "total" : 4,
   "size" : 4
@@ -744,14 +745,17 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept: application/json' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes' -i -X POST \
+    -H 'Accept: application/json' \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "optionalmodules" : [ {
-    "id" : 3
+    "id" : 309
   } ],
   "name" : "TestName1",
   "description" : "Desc1",
   "mandatorymodules" : [ {
-    "id" : 1
+    "id" : 308
   } ],
   "key" : "test1"
 } ]'</code></pre>
@@ -763,19 +767,19 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettypes HTTP/1.1
-Content-Type: application/json;charset=UTF-8
+Content-Length: 173
 Accept: application/json
+Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 169
 
 [ {
   "optionalmodules" : [ {
-    "id" : 3
+    "id" : 309
   } ],
   "name" : "TestName1",
   "description" : "Desc1",
   "mandatorymodules" : [ {
-    "id" : 1
+    "id" : 308
   } ],
   "key" : "test1"
 } ]</code></pre>
@@ -923,24 +927,24 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Content-Length: 370
 Content-Type: application/json;charset=UTF-8
-Content-Length: 366
 
 [ {
   "createdBy" : "uploadTester",
-  "createdAt" : 1539329418098,
+  "createdAt" : 1549349055023,
   "lastModifiedBy" : "uploadTester",
-  "lastModifiedAt" : 1539329418098,
+  "lastModifiedAt" : 1549349055023,
   "name" : "TestName1",
   "description" : "Desc1",
   "key" : "test1",
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/5"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/413"
     }
   },
-  "id" : 5
+  "id" : 413
 } ]</code></pre>
 </div>
 </div>
@@ -1027,7 +1031,7 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/41' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/449' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -1035,7 +1039,7 @@
 <h4 id="_request_url_3"><a class="link" href="#_request_url_3">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsettypes/41 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsettypes/449 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -1144,7 +1148,8 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/14' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/422' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -1152,7 +1157,7 @@
 <h4 id="_request_url_4"><a class="link" href="#_request_url_4">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/14 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/422 HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -1274,30 +1279,30 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 688
 Content-Type: application/json;charset=UTF-8
-Content-Length: 684
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329418240,
+  "createdAt" : 1549349055201,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329418376,
+  "lastModifiedAt" : 1549349055372,
   "name" : "OS (FW) mandatory, runtime (FW) and app (SW) optional",
   "description" : "Desc1234",
   "key" : "test_default_ds_type",
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/14"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/422"
     },
     "mandatorymodules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/14/mandatorymoduletypes"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/422/mandatorymoduletypes"
     },
     "optionalmodules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/14/optionalmoduletypes"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/422/optionalmoduletypes"
     }
   },
-  "id" : 14
+  "id" : 422
 }</code></pre>
 </div>
 </div>
@@ -1374,7 +1379,9 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/45' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/453' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "description" : "an updated desription"
 }'</code></pre>
 </div>
@@ -1384,10 +1391,10 @@
 <h4 id="_request_url_5"><a class="link" href="#_request_url_5">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsettypes/45 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/distributionsettypes/453 HTTP/1.1
 Content-Type: application/json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 45
+Host: management-api.host.com
 
 {
   "description" : "an updated desription"
@@ -1542,29 +1549,29 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 697
+Content-Length: 701
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329418873,
+  "createdAt" : 1549349055951,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329418910,
+  "lastModifiedAt" : 1549349055997,
   "name" : "OS (FW) mandatory, runtime (FW) and app (SW) optional",
   "description" : "an updated desription",
   "key" : "test_default_ds_type",
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/45"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/453"
     },
     "mandatorymodules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/45/mandatorymoduletypes"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/453/mandatorymoduletypes"
     },
     "optionalmodules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/45/optionalmoduletypes"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/453/optionalmoduletypes"
     }
   },
-  "id" : 45
+  "id" : 453
 }</code></pre>
 </div>
 </div>
@@ -1651,7 +1658,8 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/32/mandatorymoduletypes' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/440/mandatorymoduletypes' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -1659,7 +1667,7 @@
 <h4 id="_request_url_6"><a class="link" href="#_request_url_6">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/32/mandatorymoduletypes HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/440/mandatorymoduletypes HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -1776,13 +1784,13 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 384
+Content-Length: 386
 
 [ {
   "createdBy" : "system",
-  "createdAt" : 1539329418636,
+  "createdAt" : 1549349055696,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329418642,
+  "lastModifiedAt" : 1549349055705,
   "name" : "OS",
   "description" : "Updated description.",
   "key" : "os",
@@ -1790,10 +1798,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/19"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/325"
     }
   },
-  "id" : 19
+  "id" : 325
 } ]</code></pre>
 </div>
 </div>
@@ -1870,8 +1878,10 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/27/mandatorymoduletypes' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '{
-  "id" : 16
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/435/mandatorymoduletypes' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
+  "id" : 323
 }'</code></pre>
 </div>
 </div>
@@ -1880,13 +1890,13 @@
 <h4 id="_request_url_7"><a class="link" href="#_request_url_7">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettypes/27/mandatorymoduletypes HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettypes/435/mandatorymoduletypes HTTP/1.1
+Content-Length: 16
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 15
 
 {
-  "id" : 16
+  "id" : 323
 }</code></pre>
 </div>
 </div>
@@ -2038,7 +2048,8 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/59/mandatorymoduletypes/37' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/467/mandatorymoduletypes/343' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -2046,7 +2057,7 @@
 <h4 id="_request_url_8"><a class="link" href="#_request_url_8">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsettypes/59/mandatorymoduletypes/37 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsettypes/467/mandatorymoduletypes/343 HTTP/1.1
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com</code></pre>
 </div>
@@ -2160,7 +2171,8 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/50/mandatorymoduletypes/32' -i -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/458/mandatorymoduletypes/338' -i -X GET \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -2168,7 +2180,7 @@
 <h4 id="_request_url_9"><a class="link" href="#_request_url_9">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/50/mandatorymoduletypes/32 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/458/mandatorymoduletypes/338 HTTP/1.1
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com</code></pre>
 </div>
@@ -2288,14 +2300,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 382
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 380
 
 {
   "createdBy" : "system",
-  "createdAt" : 1539329418933,
+  "createdAt" : 1549349056028,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329418939,
+  "lastModifiedAt" : 1549349056037,
   "name" : "OS",
   "description" : "Updated description.",
   "key" : "os",
@@ -2303,10 +2315,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/32"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/338"
     }
   },
-  "id" : 32
+  "id" : 338
 }</code></pre>
 </div>
 </div>
@@ -2383,7 +2395,8 @@
 <h4 id="_curl_10"><a class="link" href="#_curl_10">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/37/optionalmoduletypes' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/445/optionalmoduletypes' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -2391,7 +2404,7 @@
 <h4 id="_request_url_10"><a class="link" href="#_request_url_10">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/37/optionalmoduletypes HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/445/optionalmoduletypes HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -2507,14 +2520,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 396
 Content-Type: application/json;charset=UTF-8
-Content-Length: 394
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329418712,
+  "createdAt" : 1549349055781,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329418715,
+  "lastModifiedAt" : 1549349055784,
   "name" : "runtime",
   "description" : "Updated description.",
   "key" : "runtime",
@@ -2522,10 +2535,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/24"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/330"
     }
   },
-  "id" : 24
+  "id" : 330
 } ]</code></pre>
 </div>
 </div>
@@ -2602,8 +2615,10 @@
 <h4 id="_curl_11"><a class="link" href="#_curl_11">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/64/optionalmoduletypes' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '{
-  "id" : 40
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/472/optionalmoduletypes' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
+  "id" : 346
 }'</code></pre>
 </div>
 </div>
@@ -2612,13 +2627,13 @@
 <h4 id="_request_url_11"><a class="link" href="#_request_url_11">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettypes/64/optionalmoduletypes HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/distributionsettypes/472/optionalmoduletypes HTTP/1.1
+Content-Length: 16
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 15
 
 {
-  "id" : 40
+  "id" : 346
 }</code></pre>
 </div>
 </div>
@@ -2773,7 +2788,8 @@
 <h4 id="_curl_12"><a class="link" href="#_curl_12">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/69/optionalmoduletypes/44' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/477/optionalmoduletypes/349' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -2781,7 +2797,7 @@
 <h4 id="_request_url_12"><a class="link" href="#_request_url_12">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsettypes/69/optionalmoduletypes/44 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/distributionsettypes/477/optionalmoduletypes/349 HTTP/1.1
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com</code></pre>
 </div>
@@ -2895,7 +2911,8 @@
 <h4 id="_curl_13"><a class="link" href="#_curl_13">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/10/optionalmoduletypes/4' -i -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/distributionsettypes/418/optionalmoduletypes/310' -i -X GET \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -2903,7 +2920,7 @@
 <h4 id="_request_url_13"><a class="link" href="#_request_url_13">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/10/optionalmoduletypes/4 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/distributionsettypes/418/optionalmoduletypes/310 HTTP/1.1
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com</code></pre>
 </div>
@@ -3019,14 +3036,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 409
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 405
 
 {
   "createdBy" : "system",
-  "createdAt" : 1539329418152,
+  "createdAt" : 1549349055064,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329418162,
+  "lastModifiedAt" : 1549349055078,
   "name" : "Application",
   "description" : "Updated description.",
   "key" : "application",
@@ -3034,10 +3051,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/4"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/310"
     }
   },
-  "id" : 4
+  "id" : 310
 }</code></pre>
 </div>
 </div>
diff --git a/rest-api/index.html b/rest-api/index.html
index 07927d8..724b9ec 100644
--- a/rest-api/index.html
+++ b/rest-api/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title> - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -515,7 +515,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/rest-api/rollout-api-guide/index.html b/rest-api/rollout-api-guide/index.html
index d06a068..0ea4658 100644
--- a/rest-api/rollout-api-guide/index.html
+++ b/rest-api/rollout-api-guide/index.html
@@ -452,7 +452,8 @@
 <h4 id="_curl"><a class="link" href="#_curl">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -634,13 +635,13 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388910,
+    "createdAt" : 1549349017321,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329389008,
+    "lastModifiedAt" : 1549349017461,
     "name" : "exampleRollout",
     "description" : "exampleDescription",
     "targetFilterQuery" : "controllerId==exampleTarget*",
-    "distributionSetId" : 15,
+    "distributionSetId" : 31,
     "status" : "ready",
     "totalTargets" : 20,
     "deleted" : false,
@@ -724,7 +725,8 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/2' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/2' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -903,17 +905,17 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 1337
+Content-Length: 1338
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329385019,
+  "createdAt" : 1549349012165,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329385197,
+  "lastModifiedAt" : 1549349012394,
   "name" : "exampleRollout",
   "description" : "exampleDescription",
   "targetFilterQuery" : "controllerId==exampleTarget*",
-  "distributionSetId" : 2,
+  "distributionSetId" : 18,
   "status" : "ready",
   "totalTargets" : 20,
   "totalTargetsPerStatus" : {
@@ -1028,8 +1030,11 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts' -i -X POST -H 'Content-Type: application/hal+json;charset=UTF-8' -H 'Accept: application/hal+json' -d '{
-  "distributionSetId" : 6,
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts' -i -X POST \
+    -H 'Content-Type: application/hal+json;charset=UTF-8' \
+    -H 'Accept: application/hal+json' \
+    -d '{
+  "distributionSetId" : 22,
   "successCondition" : {
     "condition" : "THRESHOLD",
     "expression" : "50"
@@ -1060,12 +1065,12 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/rollouts HTTP/1.1
 Content-Type: application/hal+json;charset=UTF-8
+Content-Length: 490
 Accept: application/hal+json
 Host: management-api.host.com
-Content-Length: 489
 
 {
-  "distributionSetId" : 6,
+  "distributionSetId" : 22,
   "successCondition" : {
     "condition" : "THRESHOLD",
     "expression" : "50"
@@ -1376,17 +1381,17 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 1336
+Content-Length: 1337
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329386999,
+  "createdAt" : 1549349014678,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329386999,
+  "lastModifiedAt" : 1549349014678,
   "name" : "exampleRollout",
   "description" : "Rollout for all named targets",
   "targetFilterQuery" : "id==targets-*",
-  "distributionSetId" : 6,
+  "distributionSetId" : 22,
   "status" : "creating",
   "totalTargets" : 20,
   "totalTargetsPerStatus" : {
@@ -1436,8 +1441,11 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts' -i -X POST -H 'Content-Type: application/json' -H 'Accept: application/hal+json' -d '{
-  "distributionSetId" : 8,
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts' -i -X POST \
+    -H 'Content-Type: application/json' \
+    -H 'Accept: application/hal+json' \
+    -d '{
+  "distributionSetId" : 24,
   "successCondition" : {
     "condition" : "THRESHOLD",
     "expression" : "50"
@@ -1500,11 +1508,11 @@
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/rollouts HTTP/1.1
 Content-Type: application/json
 Accept: application/hal+json
+Content-Length: 1206
 Host: management-api.host.com
-Content-Length: 1205
 
 {
-  "distributionSetId" : 8,
+  "distributionSetId" : 24,
   "successCondition" : {
     "condition" : "THRESHOLD",
     "expression" : "50"
@@ -1958,17 +1966,17 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 1353
+Content-Length: 1354
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329387364,
+  "createdAt" : 1549349015225,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329387364,
+  "lastModifiedAt" : 1549349015225,
   "name" : "exampleRolloutWithDefinedGroups",
   "description" : "Rollout for all named targets",
   "targetFilterQuery" : "id==targets-*",
-  "distributionSetId" : 8,
+  "distributionSetId" : 24,
   "status" : "creating",
   "totalTargets" : 10,
   "totalTargetsPerStatus" : {
@@ -2090,7 +2098,8 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/1/approve' -i -X POST -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/1/approve' -i -X POST \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2182,7 +2191,8 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/7/deny' -i -X POST -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/7/deny' -i -X POST \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2272,7 +2282,8 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/12/start' -i -X POST -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/12/start' -i -X POST \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2362,7 +2373,8 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/5/pause' -i -X POST -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/5/pause' -i -X POST \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2449,7 +2461,8 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/4/resume' -i -X POST -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/4/resume' -i -X POST \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2653,7 +2666,8 @@
 <h4 id="_curl_11"><a class="link" href="#_curl_11">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/13/deploygroups' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/13/deploygroups' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2922,9 +2936,9 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388453,
+    "createdAt" : 1549349016649,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388545,
+    "lastModifiedAt" : 1549349016769,
     "name" : "group-1",
     "description" : "group-1",
     "successCondition" : {
@@ -2955,9 +2969,9 @@
     "id" : 113
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388454,
+    "createdAt" : 1549349016650,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388546,
+    "lastModifiedAt" : 1549349016770,
     "name" : "group-2",
     "description" : "group-2",
     "successCondition" : {
@@ -2988,9 +3002,9 @@
     "id" : 114
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388454,
+    "createdAt" : 1549349016651,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388547,
+    "lastModifiedAt" : 1549349016771,
     "name" : "group-3",
     "description" : "group-3",
     "successCondition" : {
@@ -3021,9 +3035,9 @@
     "id" : 115
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388455,
+    "createdAt" : 1549349016652,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388547,
+    "lastModifiedAt" : 1549349016771,
     "name" : "group-4",
     "description" : "group-4",
     "successCondition" : {
@@ -3054,9 +3068,9 @@
     "id" : 116
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388455,
+    "createdAt" : 1549349016654,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388547,
+    "lastModifiedAt" : 1549349016772,
     "name" : "group-5",
     "description" : "group-5",
     "successCondition" : {
@@ -3087,9 +3101,9 @@
     "id" : 117
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388456,
+    "createdAt" : 1549349016655,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388548,
+    "lastModifiedAt" : 1549349016772,
     "name" : "group-6",
     "description" : "group-6",
     "successCondition" : {
@@ -3120,9 +3134,9 @@
     "id" : 118
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388456,
+    "createdAt" : 1549349016656,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388548,
+    "lastModifiedAt" : 1549349016773,
     "name" : "group-7",
     "description" : "group-7",
     "successCondition" : {
@@ -3153,9 +3167,9 @@
     "id" : 119
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388457,
+    "createdAt" : 1549349016658,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388548,
+    "lastModifiedAt" : 1549349016773,
     "name" : "group-8",
     "description" : "group-8",
     "successCondition" : {
@@ -3186,9 +3200,9 @@
     "id" : 120
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388457,
+    "createdAt" : 1549349016659,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388549,
+    "lastModifiedAt" : 1549349016774,
     "name" : "group-9",
     "description" : "group-9",
     "successCondition" : {
@@ -3219,9 +3233,9 @@
     "id" : 121
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388458,
+    "createdAt" : 1549349016660,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388549,
+    "lastModifiedAt" : 1549349016774,
     "name" : "group-10",
     "description" : "group-10",
     "successCondition" : {
@@ -3329,7 +3343,8 @@
 <h4 id="_curl_12"><a class="link" href="#_curl_12">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/16/deploygroups/143' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/16/deploygroups/143' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -3541,14 +3556,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 889
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329389121,
+  "createdAt" : 1549349017661,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329389200,
+  "lastModifiedAt" : 1549349017833,
   "name" : "group-1",
   "description" : "group-1",
   "successCondition" : {
@@ -3661,7 +3676,8 @@
 <h4 id="_curl_13"><a class="link" href="#_curl_13">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/14/deploygroups/123/targets' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/rollouts/14/deploygroups/123/targets' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -3851,7 +3867,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">content[].ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -3868,20 +3884,20 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 1077
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388663,
+    "createdAt" : 1549349016933,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388663,
+    "lastModifiedAt" : 1549349016933,
     "name" : "exampleTarget-00000",
     "description" : "exampleTarget0",
     "controllerId" : "exampleTarget-00000",
     "updateStatus" : "unknown",
-    "securityToken" : "46ea15493d632ce1b8f7987ae1d630ba",
+    "securityToken" : "8fc58e5e0bdb29463bbe989d08f3dfdc",
     "requestAttributes" : true,
     "_links" : {
       "self" : {
@@ -3890,14 +3906,14 @@
     }
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329388664,
+    "createdAt" : 1549349016936,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329388664,
+    "lastModifiedAt" : 1549349016936,
     "name" : "exampleTarget-00001",
     "description" : "exampleTarget1",
     "controllerId" : "exampleTarget-00001",
     "updateStatus" : "unknown",
-    "securityToken" : "df74e44b37dabc9168351fb7ce5d3f2c",
+    "securityToken" : "1b0e508cfd4454a46e54869c17efb0d7",
     "requestAttributes" : true,
     "_links" : {
       "self" : {
diff --git a/rest-api/rootcontroller-api-guide/index.html b/rest-api/rootcontroller-api-guide/index.html
index d4629f2..27f5d40 100644
--- a/rest-api/rootcontroller-api-guide/index.html
+++ b/rest-api/rootcontroller-api-guide/index.html
@@ -447,7 +447,8 @@
 <h4 id="_curl"><a class="link" href="#_curl">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -456,8 +457,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID HTTP/1.1
-Accept: application/hal+json
-Host: ddi-api.host.com</code></pre>
+Host: ddi-api.host.com
+Accept: application/hal+json</code></pre>
 </div>
 </div>
 </div>
@@ -546,7 +547,7 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 354
+Content-Length: 355
 
 {
   "config" : {
@@ -556,7 +557,7 @@
   },
   "_links" : {
     "deploymentBase" : {
-      "href" : "https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/3?c=-2129030598"
+      "href" : "https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/81?c=-2056995960"
     },
     "configData" : {
       "href" : "https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/configData"
@@ -626,7 +627,7 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 336
+Content-Length: 337
 
 {
   "config" : {
@@ -636,7 +637,7 @@
   },
   "_links" : {
     "cancelAction" : {
-      "href" : "https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/1"
+      "href" : "https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/79"
     },
     "configData" : {
       "href" : "https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/configData"
@@ -713,7 +714,8 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/6' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/84' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -721,9 +723,9 @@
 <h4 id="_request_url_2"><a class="link" href="#_request_url_2">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/6 HTTP/1.1
-Accept: application/hal+json
-Host: ddi-api.host.com</code></pre>
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/84 HTTP/1.1
+Host: ddi-api.host.com
+Accept: application/hal+json</code></pre>
 </div>
 </div>
 </div>
@@ -803,13 +805,13 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 63
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 61
 
 {
-  "id" : "6",
+  "id" : "84",
   "cancelAction" : {
-    "stopId" : "6"
+    "stopId" : "84"
   }
 }</code></pre>
 </div>
@@ -882,8 +884,10 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/9/feedback' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '{
-  "id" : "9",
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/87/feedback' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
+  "id" : "87",
   "time" : "20140511T121314",
   "status" : {
     "result" : {
@@ -900,13 +904,13 @@
 <h4 id="_request_url_3"><a class="link" href="#_request_url_3">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/9/feedback HTTP/1.1
-Content-Type: application/json;charset=UTF-8
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /TENANT_ID/controller/v1/CONTROLLER_ID/cancelAction/87/feedback HTTP/1.1
+Content-Length: 184
 Host: ddi-api.host.com
-Content-Length: 183
+Content-Type: application/json;charset=UTF-8
 
 {
-  "id" : "9",
+  "id" : "87",
   "time" : "20140511T121314",
   "status" : {
     "result" : {
@@ -1101,7 +1105,9 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/configData' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/configData' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "mode" : "merge",
   "data" : {
     "VIN" : "JH4TB2H26CC000000",
@@ -1125,9 +1131,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /TENANT_ID/controller/v1/CONTROLLER_ID/configData HTTP/1.1
-Content-Type: application/json;charset=UTF-8
 Host: ddi-api.host.com
 Content-Length: 260
+Content-Type: application/json;charset=UTF-8
 
 {
   "mode" : "merge",
@@ -1343,7 +1349,8 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/4?actionHistory=10' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/82?actionHistory=10' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -1351,9 +1358,9 @@
 <h4 id="_request_url_5"><a class="link" href="#_request_url_5">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/4?actionHistory=10 HTTP/1.1
-Accept: application/hal+json
-Host: ddi-api.host.com</code></pre>
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/82?actionHistory=10 HTTP/1.1
+Host: ddi-api.host.com
+Accept: application/hal+json</code></pre>
 </div>
 </div>
 </div>
@@ -1590,105 +1597,152 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 6645
+Content-Length: 6670
 
 {
-  "id" : "4",
+  "id" : "82",
   "deployment" : {
     "download" : "forced",
     "update" : "forced",
     "maintenanceWindow" : "available",
     "chunks" : [ {
-      "part" : "jvm",
-      "version" : "1.0.90",
-      "name" : "oneapp runtime",
-      "artifacts" : [ {
-        "filename" : "binary.tgz",
-        "hashes" : {
-          "sha1" : "948bf76ba6ee8bec435b96cc19619a3c46cdb569",
-          "md5" : "b865fc493e4c318f3cc2fa8a2849e7df"
-        },
-        "size" : 15,
-        "_links" : {
-          "download" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/binary.tgz"
-          },
-          "md5sum" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/binary.tgz.MD5SUM"
-          },
-          "download-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/binary.tgz"
-          },
-          "md5sum-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/binary.tgz.MD5SUM"
-          }
-        }
-      }, {
-        "filename" : "file.signature",
-        "hashes" : {
-          "sha1" : "948bf76ba6ee8bec435b96cc19619a3c46cdb569",
-          "md5" : "b865fc493e4c318f3cc2fa8a2849e7df"
-        },
-        "size" : 15,
-        "_links" : {
-          "download" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/file.signature"
-          },
-          "md5sum" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/file.signature.MD5SUM"
-          },
-          "download-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/file.signature"
-          },
-          "md5sum-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/11/filename/file.signature.MD5SUM"
-          }
-        }
-      } ]
-    }, {
       "part" : "bApp",
-      "version" : "1.0.44",
+      "version" : "1.0.84",
       "name" : "oneapplication",
       "artifacts" : [ {
         "filename" : "binary.tgz",
         "hashes" : {
-          "sha1" : "8358cb1ab2f64fe5b89f33d8efc9368f725af7ab",
-          "md5" : "bae2dfcdce0f53b143118b7a9c45b31a"
+          "sha1" : "4df0ac3853d44be312a573e6b5371df0da3f3857",
+          "md5" : "1fbd348a278c9ac646e766fe3e58ce6b"
         },
-        "size" : 15,
+        "size" : 11,
         "_links" : {
           "download" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/binary.tgz"
-          },
-          "md5sum" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/binary.tgz.MD5SUM"
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/binary.tgz"
           },
           "download-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/binary.tgz"
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/binary.tgz"
           },
           "md5sum-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/binary.tgz.MD5SUM"
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/binary.tgz.MD5SUM"
+          },
+          "md5sum" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/binary.tgz.MD5SUM"
           }
         }
       }, {
         "filename" : "file.signature",
         "hashes" : {
-          "sha1" : "8358cb1ab2f64fe5b89f33d8efc9368f725af7ab",
-          "md5" : "bae2dfcdce0f53b143118b7a9c45b31a"
+          "sha1" : "4df0ac3853d44be312a573e6b5371df0da3f3857",
+          "md5" : "1fbd348a278c9ac646e766fe3e58ce6b"
         },
-        "size" : 15,
+        "size" : 11,
         "_links" : {
           "download" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/file.signature"
-          },
-          "md5sum" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/file.signature.MD5SUM"
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/file.signature"
           },
           "download-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/file.signature"
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/file.signature"
           },
           "md5sum-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/10/filename/file.signature.MD5SUM"
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/file.signature.MD5SUM"
+          },
+          "md5sum" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/305/filename/file.signature.MD5SUM"
+          }
+        }
+      } ]
+    }, {
+      "part" : "jvm",
+      "version" : "1.0.46",
+      "name" : "oneapp runtime",
+      "artifacts" : [ {
+        "filename" : "binary.tgz",
+        "hashes" : {
+          "sha1" : "5383ad6bbc9621d53b76f71a4506e15d96e9b05b",
+          "md5" : "aabd29220f01a56199666a31c3fa25a9"
+        },
+        "size" : 11,
+        "_links" : {
+          "download" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/binary.tgz"
+          },
+          "download-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/binary.tgz"
+          },
+          "md5sum-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/binary.tgz.MD5SUM"
+          },
+          "md5sum" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/binary.tgz.MD5SUM"
+          }
+        }
+      }, {
+        "filename" : "file.signature",
+        "hashes" : {
+          "sha1" : "5383ad6bbc9621d53b76f71a4506e15d96e9b05b",
+          "md5" : "aabd29220f01a56199666a31c3fa25a9"
+        },
+        "size" : 11,
+        "_links" : {
+          "download" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/file.signature"
+          },
+          "download-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/file.signature"
+          },
+          "md5sum-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/file.signature.MD5SUM"
+          },
+          "md5sum" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/306/filename/file.signature.MD5SUM"
+          }
+        }
+      } ]
+    }, {
+      "part" : "os",
+      "version" : "1.0.36",
+      "name" : "one Firmware",
+      "artifacts" : [ {
+        "filename" : "binary.tgz",
+        "hashes" : {
+          "sha1" : "0cf2d6b7b8ab95ddd112552d4e33d47eccd154d8",
+          "md5" : "4bca8e4b19782a7fef9c01c9b0e6717b"
+        },
+        "size" : 11,
+        "_links" : {
+          "download" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/binary.tgz"
+          },
+          "download-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/binary.tgz"
+          },
+          "md5sum-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/binary.tgz.MD5SUM"
+          },
+          "md5sum" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/binary.tgz.MD5SUM"
+          }
+        }
+      }, {
+        "filename" : "file.signature",
+        "hashes" : {
+          "sha1" : "0cf2d6b7b8ab95ddd112552d4e33d47eccd154d8",
+          "md5" : "4bca8e4b19782a7fef9c01c9b0e6717b"
+        },
+        "size" : 11,
+        "_links" : {
+          "download" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/file.signature"
+          },
+          "download-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/file.signature"
+          },
+          "md5sum-http" : {
+            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/file.signature.MD5SUM"
+          },
+          "md5sum" : {
+            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/307/filename/file.signature.MD5SUM"
           }
         }
       } ],
@@ -1696,53 +1750,6 @@
         "key" : "aMetadataKey",
         "value" : "Metadata value as defined in software module"
       } ]
-    }, {
-      "part" : "os",
-      "version" : "1.0.69",
-      "name" : "one Firmware",
-      "artifacts" : [ {
-        "filename" : "binary.tgz",
-        "hashes" : {
-          "sha1" : "a64e64667db1000b7377c4f5dab3a2992d1efe33",
-          "md5" : "9b23e51ba2ce6c5a91aa1134d11b4e43"
-        },
-        "size" : 15,
-        "_links" : {
-          "download" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/binary.tgz"
-          },
-          "md5sum" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/binary.tgz.MD5SUM"
-          },
-          "download-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/binary.tgz"
-          },
-          "md5sum-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/binary.tgz.MD5SUM"
-          }
-        }
-      }, {
-        "filename" : "file.signature",
-        "hashes" : {
-          "sha1" : "a64e64667db1000b7377c4f5dab3a2992d1efe33",
-          "md5" : "9b23e51ba2ce6c5a91aa1134d11b4e43"
-        },
-        "size" : 15,
-        "_links" : {
-          "download" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/file.signature"
-          },
-          "md5sum" : {
-            "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/file.signature.MD5SUM"
-          },
-          "download-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/file.signature"
-          },
-          "md5sum-http" : {
-            "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/12/filename/file.signature.MD5SUM"
-          }
-        }
-      } ]
     } ]
   },
   "actionHistory" : {
@@ -1771,28 +1778,28 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 495
+Content-Length: 496
 
 {
-  "id" : "7",
+  "id" : "85",
   "deployment" : {
     "download" : "forced",
     "update" : "skip",
     "maintenanceWindow" : "unavailable",
     "chunks" : [ {
-      "part" : "os",
-      "version" : "1.0.49",
-      "name" : "one Firmware",
+      "part" : "jvm",
+      "version" : "1.0.51",
+      "name" : "oneapp runtime",
       "artifacts" : [ ]
     }, {
       "part" : "bApp",
-      "version" : "1.0.43",
+      "version" : "1.0.83",
       "name" : "oneapplication",
       "artifacts" : [ ]
     }, {
-      "part" : "jvm",
-      "version" : "1.0.12",
-      "name" : "oneapp runtime",
+      "part" : "os",
+      "version" : "1.0.30",
+      "name" : "one Firmware",
       "artifacts" : [ ]
     } ]
   }
@@ -1867,8 +1874,11 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/5/feedback' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept: application/hal+json' -d '{
-  "id" : "5",
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/83/feedback' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -H 'Accept: application/hal+json' \
+    -d '{
+  "id" : "83",
   "time" : "20140511T121314",
   "status" : {
     "result" : {
@@ -1889,14 +1899,14 @@
 <h4 id="_request_url_6"><a class="link" href="#_request_url_6">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/5/feedback HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /TENANT_ID/controller/v1/CONTROLLER_ID/deploymentBase/83/feedback HTTP/1.1
+Content-Length: 250
+Host: ddi-api.host.com
 Content-Type: application/json;charset=UTF-8
 Accept: application/hal+json
-Host: ddi-api.host.com
-Content-Length: 249
 
 {
-  "id" : "5",
+  "id" : "83",
   "time" : "20140511T121314",
   "status" : {
     "result" : {
@@ -2102,7 +2112,8 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/softwaremodules/22/artifacts' -i -H 'Accept: application/hal+json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://ddi-api.host.com/TENANT_ID/controller/v1/CONTROLLER_ID/softwaremodules/318/artifacts' -i -X GET \
+    -H 'Accept: application/hal+json'</code></pre>
 </div>
 </div>
 </div>
@@ -2110,9 +2121,9 @@
 <h4 id="_request_url_7"><a class="link" href="#_request_url_7">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID/softwaremodules/22/artifacts HTTP/1.1
-Accept: application/hal+json
-Host: ddi-api.host.com</code></pre>
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /TENANT_ID/controller/v1/CONTROLLER_ID/softwaremodules/318/artifacts HTTP/1.1
+Host: ddi-api.host.com
+Accept: application/hal+json</code></pre>
 </div>
 </div>
 </div>
@@ -2229,27 +2240,27 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 839
+Content-Length: 843
 
 [ {
   "filename" : "binaryFile",
   "hashes" : {
-    "sha1" : "432030f97de2ce8243c0900e1b3269d6ee688cca",
-    "md5" : "b514c904f385cbc12c062a77cb8c0fbd"
+    "sha1" : "8820d4cf145029cb0a9ddbe48d0e59f132ceb18d",
+    "md5" : "c75a407eb316826dfe2d5c9c0aa8bb49"
   },
-  "size" : 15,
+  "size" : 11,
   "_links" : {
     "download" : {
-      "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/22/filename/binaryFile"
-    },
-    "md5sum" : {
-      "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/22/filename/binaryFile.MD5SUM"
+      "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/318/filename/binaryFile"
     },
     "download-http" : {
-      "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/22/filename/binaryFile"
+      "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/318/filename/binaryFile"
     },
     "md5sum-http" : {
-      "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/22/filename/binaryFile.MD5SUM"
+      "href" : "http://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/318/filename/binaryFile.MD5SUM"
+    },
+    "md5sum" : {
+      "href" : "https://link-to-cdn.com/api/v1/TENANT_ID/download/controller/CONTROLLER_ID/softwaremodules/318/filename/binaryFile.MD5SUM"
     }
   }
 } ]</code></pre>
diff --git a/rest-api/softwaremodules-api-guide/index.html b/rest-api/softwaremodules-api-guide/index.html
index c80d777..e30e8bb 100644
--- a/rest-api/softwaremodules-api-guide/index.html
+++ b/rest-api/softwaremodules-api-guide/index.html
@@ -455,7 +455,7 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -618,14 +618,14 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 959
+Content-Length: 963
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329396480,
+    "createdAt" : 1549349025236,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329396483,
+    "lastModifiedAt" : 1549349025241,
     "name" : "os",
     "description" : "a description",
     "version" : "1.0",
@@ -634,15 +634,15 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/17"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/113"
       }
     },
-    "id" : 17
+    "id" : 113
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329396486,
+    "createdAt" : 1549349025248,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329396488,
+    "lastModifiedAt" : 1549349025253,
     "name" : "application",
     "description" : "a description",
     "version" : "1.0",
@@ -651,10 +651,10 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/18"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/114"
       }
     },
-    "id" : 18
+    "id" : 114
   } ],
   "total" : 2,
   "size" : 2
@@ -729,7 +729,9 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules' -i -X POST -H 'Content-Type: application/hal+json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules' -i -X POST \
+    -H 'Content-Type: application/hal+json;charset=UTF-8' \
+    -d '[ {
   "vendor" : "vendor1",
   "name" : "name1",
   "description" : "description1",
@@ -750,9 +752,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules HTTP/1.1
+Content-Length: 261
 Content-Type: application/hal+json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 261
 
 [ {
   "vendor" : "vendor1",
@@ -924,13 +926,13 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 807
+Content-Length: 815
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329395688,
+  "createdAt" : 1549349024009,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329395688,
+  "lastModifiedAt" : 1549349024009,
   "name" : "name1",
   "description" : "description1",
   "version" : "version1",
@@ -939,15 +941,15 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/5"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/100"
     }
   },
-  "id" : 5
+  "id" : 100
 }, {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329395690,
+  "createdAt" : 1549349024011,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329395690,
+  "lastModifiedAt" : 1549349024011,
   "name" : "name3",
   "description" : "description1",
   "version" : "version1",
@@ -956,10 +958,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/4"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/101"
     }
   },
-  "id" : 4
+  "id" : 101
 } ]</code></pre>
 </div>
 </div>
@@ -1046,7 +1048,7 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/2' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/98' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -1054,7 +1056,7 @@
 <h4 id="_request_url_3"><a class="link" href="#_request_url_3">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremodules/2 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremodules/98 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -1163,7 +1165,7 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/6' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/102' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -1171,7 +1173,7 @@
 <h4 id="_request_url_4"><a class="link" href="#_request_url_4">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/6 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/102 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -1311,13 +1313,13 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 750
+Content-Length: 759
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329395784,
+  "createdAt" : 1549349024156,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329395787,
+  "lastModifiedAt" : 1549349024160,
   "name" : "os",
   "description" : "a description",
   "version" : "1.0",
@@ -1326,19 +1328,19 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/6"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/102"
     },
     "artifacts" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/6/artifacts"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/102/artifacts"
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/14"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/118"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/6/metadata?offset=0&amp;limit=50"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/102/metadata?offset=0&amp;limit=50"
     }
   },
-  "id" : 6
+  "id" : 102
 }</code></pre>
 </div>
 </div>
@@ -1415,7 +1417,9 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/3' -i -X PUT -H 'Content-Type: application/hal+json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/99' -i -X PUT \
+    -H 'Content-Type: application/hal+json;charset=UTF-8' \
+    -d '{
   "vendor" : "another Vendor",
   "description" : "a new description"
 }'</code></pre>
@@ -1426,10 +1430,10 @@
 <h4 id="_request_url_5"><a class="link" href="#_request_url_5">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/softwaremodules/3 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/softwaremodules/99 HTTP/1.1
 Content-Type: application/hal+json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 72
+Host: management-api.host.com
 
 {
   "vendor" : "another Vendor",
@@ -1609,14 +1613,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 747
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 741
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329395536,
+  "createdAt" : 1549349023791,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329395550,
+  "lastModifiedAt" : 1549349023816,
   "name" : "os",
   "description" : "a new description",
   "version" : "1.0",
@@ -1625,19 +1629,19 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/3"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/99"
     },
     "artifacts" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/3/artifacts"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/99/artifacts"
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/8"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/113"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/3/metadata?offset=0&amp;limit=50"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/99/metadata?offset=0&amp;limit=50"
     }
   },
-  "id" : 3
+  "id" : 99
 }</code></pre>
 </div>
 </div>
@@ -1724,7 +1728,7 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/16/artifacts' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/112/artifacts' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -1732,7 +1736,7 @@
 <h4 id="_request_url_6"><a class="link" href="#_request_url_6">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/16/artifacts HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/112/artifacts HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -1842,25 +1846,25 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 442
+Content-Length: 445
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329396401,
+  "createdAt" : 1549349025109,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329396401,
+  "lastModifiedAt" : 1549349025109,
   "hashes" : {
-    "sha1" : "6f081dc92905d4aea2e745c576ee9ed3a2d0680c",
-    "md5" : "6ef4d11f40aa602aba529d9f721203d3"
+    "sha1" : "fba17df1db3030be1f7cf72779cdba70b395495a",
+    "md5" : "e21d32695016f9ae05459f39aa2c151c"
   },
   "providedFilename" : "file1",
-  "size" : 15,
+  "size" : 13,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/16/artifacts/2"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/112/artifacts/47"
     }
   },
-  "id" : 2
+  "id" : 47
 } ]</code></pre>
 </div>
 </div>
@@ -1937,7 +1941,9 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/1/artifacts' -i -X POST -H 'Content-Type: multipart/form-data' -F 'file=@origFilename'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/97/artifacts' -i -X POST \
+    -H 'Content-Type: multipart/form-data' \
+    -F 'file=@origFilename'</code></pre>
 </div>
 </div>
 </div>
@@ -1945,14 +1951,14 @@
 <h4 id="_request_url_7"><a class="link" href="#_request_url_7">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules/1/artifacts HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules/97/artifacts HTTP/1.1
 Content-Type: multipart/form-data; boundary=6o2knFse3p53ty9dmcQvWAIx1zInP11uCfbm
 Host: management-api.host.com
 
 --6o2knFse3p53ty9dmcQvWAIx1zInP11uCfbm
-Content-Disposition: form-data; name=file
+Content-Disposition: form-data; name=file; filename=origFilename
 
-᫾廹佐啡
+᭭듞降𠚉
 --6o2knFse3p53ty9dmcQvWAIx1zInP11uCfbm--</code></pre>
 </div>
 </div>
@@ -2015,7 +2021,7 @@
 <h4 id="_request_parameter_example_2"><a class="link" href="#_request_parameter_example_2">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules/15/artifacts HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules/111/artifacts HTTP/1.1
 Content-Type: multipart/form-data; boundary=6o2knFse3p53ty9dmcQvWAIx1zInP11uCfbm
 Host: management-api.host.com
 
@@ -2036,9 +2042,9 @@
 
 sha1sum
 --6o2knFse3p53ty9dmcQvWAIx1zInP11uCfbm
-Content-Disposition: form-data; name=file
+Content-Disposition: form-data; name=file; filename=origFilename
 
-ᛪ渋鵃㍸렗
+獆쐿롪獟橢
 --6o2knFse3p53ty9dmcQvWAIx1zInP11uCfbm--</code></pre>
 </div>
 </div>
@@ -2132,29 +2138,29 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Content-Length: 571
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 566
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329395289,
+  "createdAt" : 1549349023466,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329395289,
+  "lastModifiedAt" : 1549349023466,
   "hashes" : {
-    "sha1" : "e20781ccb331c03a84fa49b860540e7b33a7df57",
-    "md5" : "f77be8f8405dcf5d31346b2d5d055441"
+    "sha1" : "91ec8b1468848e932884c7d3ed76218499a57be8",
+    "md5" : "fda3fefc2327e3b010b1dc3d41e01ee3"
   },
   "providedFilename" : "origFilename",
-  "size" : 15,
+  "size" : 13,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/1/artifacts/1"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/97/artifacts/46"
     },
     "download" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/1/artifacts/1/download"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/97/artifacts/46/download"
     }
   },
-  "id" : 1
+  "id" : 46
 }</code></pre>
 </div>
 </div>
@@ -2236,7 +2242,7 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/21/artifacts/5' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/117/artifacts/50' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -2244,7 +2250,7 @@
 <h4 id="_request_url_8"><a class="link" href="#_request_url_8">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremodules/21/artifacts/5 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremodules/117/artifacts/50 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2357,7 +2363,7 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/19/artifacts/3' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/115/artifacts/48' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -2365,7 +2371,7 @@
 <h4 id="_request_url_9"><a class="link" href="#_request_url_9">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/19/artifacts/3 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/115/artifacts/48 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2485,28 +2491,28 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 561
+Content-Length: 566
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329396577,
+  "createdAt" : 1549349025373,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329396577,
+  "lastModifiedAt" : 1549349025373,
   "hashes" : {
-    "sha1" : "a7675dcb76bf1bc1cd3945264053c5a400ec25c7",
-    "md5" : "e62855383e4fe7aabbfcbf50ff8b33cb"
+    "sha1" : "916b2bf37df432ee3006a7cd3122a5008d5fc37f",
+    "md5" : "6c298634494a628b798ed3e657fcd4ba"
   },
   "providedFilename" : "file1",
-  "size" : 15,
+  "size" : 11,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/19/artifacts/3"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/115/artifacts/48"
     },
     "download" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/19/artifacts/3/download"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/115/artifacts/48/download"
     }
   },
-  "id" : 3
+  "id" : 48
 }</code></pre>
 </div>
 </div>
@@ -2583,7 +2589,8 @@
 <h4 id="_curl_10"><a class="link" href="#_curl_10">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/20/artifacts/4/download' -i -H 'Accept: application/octet-stream'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/116/artifacts/49/download' -i -X GET \
+    -H 'Accept: application/octet-stream'</code></pre>
 </div>
 </div>
 </div>
@@ -2591,7 +2598,7 @@
 <h4 id="_request_url_10"><a class="link" href="#_request_url_10">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/20/artifacts/4/download HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/116/artifacts/49/download HTTP/1.1
 Accept: application/octet-stream
 Host: management-api.host.com</code></pre>
 </div>
@@ -2630,15 +2637,15 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Disposition: attachment;filename=file1
-ETag: b992e46f7d9a131b352c12d6f814c32229a956eb
+Content-Range: bytes 0-10/11
+Content-Length: 11
 Accept-Ranges: bytes
-Last-Modified: Fri, 12 Oct 2018 07:29:56 GMT
+Last-Modified: Tue, 05 Feb 2019 06:43:45 GMT
 Content-Type: application/octet-stream
-Content-Range: bytes 0-12/13
-Content-Length: 13
+Content-Disposition: attachment;filename=file1
+ETag: 36545ef35a4be23938512e775006c76960bffe5d
 
-嗡㬝𔢈䢀</code></pre>
+𧘗𤉂ꢕ</code></pre>
 </div>
 </div>
 </div>
@@ -2714,7 +2721,7 @@
 <h4 id="_curl_11"><a class="link" href="#_curl_11">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/30/metadata' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/126/metadata' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -2722,7 +2729,7 @@
 <h4 id="_request_url_11"><a class="link" href="#_request_url_11">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/30/metadata HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/126/metadata HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2785,7 +2792,7 @@
 <h4 id="_request_parameter_example_3"><a class="link" href="#_request_parameter_example_3">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/27/metadata?offset=1&amp;limit=2&amp;sort=key%3ADESC&amp;q=key%3D%3Dknown* HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/123/metadata?offset=1&amp;limit=2&amp;sort=key%3ADESC&amp;q=key%3D%3Dknown* HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2855,8 +2862,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 405
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "content" : [ {
@@ -2954,7 +2961,9 @@
 <h4 id="_curl_12"><a class="link" href="#_curl_12">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/9/metadata' -i -X POST -H 'Content-Type: application/hal+json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/105/metadata' -i -X POST \
+    -H 'Content-Type: application/hal+json;charset=UTF-8' \
+    -d '[ {
   "value" : "knownValue1",
   "key" : "knownKey1"
 }, {
@@ -2969,10 +2978,10 @@
 <h4 id="_request_url_12"><a class="link" href="#_request_url_12">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules/9/metadata HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremodules/105/metadata HTTP/1.1
 Content-Type: application/hal+json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 136
+Host: management-api.host.com
 
 [ {
   "value" : "knownValue1",
@@ -3097,8 +3106,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 163
+Content-Type: application/hal+json;charset=UTF-8
 
 [ {
   "key" : "knownKey1",
@@ -3194,7 +3203,7 @@
 <h4 id="_curl_13"><a class="link" href="#_curl_13">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/33/metadata/knownKey' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/129/metadata/knownKey' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -3202,7 +3211,7 @@
 <h4 id="_request_url_13"><a class="link" href="#_request_url_13">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremodules/33/metadata/knownKey HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremodules/129/metadata/knownKey HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -3315,7 +3324,7 @@
 <h4 id="_curl_14"><a class="link" href="#_curl_14">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/24/metadata/knownKey' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/120/metadata/knownKey' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -3323,7 +3332,7 @@
 <h4 id="_request_url_14"><a class="link" href="#_request_url_14">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/24/metadata/knownKey HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremodules/120/metadata/knownKey HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -3400,8 +3409,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 77
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "key" : "knownKey",
@@ -3483,7 +3492,9 @@
 <h4 id="_curl_15"><a class="link" href="#_curl_15">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/14/metadata/knownKey' -i -X PUT -H 'Content-Type: application/hal+json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremodules/110/metadata/knownKey' -i -X PUT \
+    -H 'Content-Type: application/hal+json;charset=UTF-8' \
+    -d '{
   "targetVisible" : true,
   "value" : "valueForUpdate",
   "key" : "knownKey"
@@ -3495,10 +3506,10 @@
 <h4 id="_request_url_15"><a class="link" href="#_request_url_15">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/softwaremodules/14/metadata/knownKey HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/softwaremodules/110/metadata/knownKey HTTP/1.1
 Content-Type: application/hal+json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 80
+Host: management-api.host.com
 
 {
   "targetVisible" : true,
@@ -3624,14 +3635,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 747
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 741
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329395536,
+  "createdAt" : 1549349023791,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329395550,
+  "lastModifiedAt" : 1549349023816,
   "name" : "os",
   "description" : "a new description",
   "version" : "1.0",
@@ -3640,19 +3651,19 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/3"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/99"
     },
     "artifacts" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/3/artifacts"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/99/artifacts"
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/8"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/113"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremodules/3/metadata?offset=0&amp;limit=50"
+      "href" : "https://management-api.host.com/rest/v1/softwaremodules/99/metadata?offset=0&amp;limit=50"
     }
   },
-  "id" : 3
+  "id" : 99
 }</code></pre>
 </div>
 </div>
diff --git a/rest-api/softwaremoduletypes-api-guide/index.html b/rest-api/softwaremoduletypes-api-guide/index.html
index a317c53..86fcee9 100644
--- a/rest-api/softwaremoduletypes-api-guide/index.html
+++ b/rest-api/softwaremoduletypes-api-guide/index.html
@@ -445,7 +445,8 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -591,15 +592,15 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 1760
 Content-Type: application/json;charset=UTF-8
-Content-Length: 1752
 
 {
   "content" : [ {
     "createdBy" : "system",
-    "createdAt" : 1539329425063,
+    "createdAt" : 1549349062020,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329425069,
+    "lastModifiedAt" : 1549349062031,
     "name" : "OS",
     "description" : "Updated description.",
     "key" : "os",
@@ -607,15 +608,15 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/17"
+        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/368"
       }
     },
-    "id" : 17
+    "id" : 368
   }, {
     "createdBy" : "system",
-    "createdAt" : 1539329425063,
+    "createdAt" : 1549349062019,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329425071,
+    "lastModifiedAt" : 1549349062036,
     "name" : "Application",
     "description" : "Updated description.",
     "key" : "application",
@@ -623,15 +624,15 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/18"
+        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/369"
       }
     },
-    "id" : 18
+    "id" : 369
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329425073,
+    "createdAt" : 1549349062039,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329425075,
+    "lastModifiedAt" : 1549349062043,
     "name" : "runtime",
     "description" : "Updated description.",
     "key" : "runtime",
@@ -639,15 +640,15 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/19"
+        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/370"
       }
     },
-    "id" : 19
+    "id" : 370
   }, {
     "createdBy" : "uploadTester",
-    "createdAt" : 1539329425093,
+    "createdAt" : 1549349062069,
     "lastModifiedBy" : "uploadTester",
-    "lastModifiedAt" : 1539329425095,
+    "lastModifiedAt" : 1549349062072,
     "name" : "test123",
     "description" : "Desc1234",
     "key" : "test123",
@@ -655,10 +656,10 @@
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/20"
+        "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/371"
       }
     },
-    "id" : 20
+    "id" : 371
   } ],
   "total" : 4,
   "size" : 4
@@ -733,7 +734,10 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept: application/json' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes' -i -X POST \
+    -H 'Accept: application/json' \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "name" : "TestName1",
   "description" : "Desc1",
   "maxAssignments" : 1,
@@ -747,10 +751,10 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/softwaremoduletypes HTTP/1.1
-Content-Type: application/json;charset=UTF-8
 Accept: application/json
-Host: management-api.host.com
+Content-Type: application/json;charset=UTF-8
 Content-Length: 100
+Host: management-api.host.com
 
 [ {
   "name" : "TestName1",
@@ -798,7 +802,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">[]maxAssignments</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Number</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Maximum number of assigments to a distribution set/target, e.g. only one firmware but multiple applications.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Maximum number of assignments to a distribution set/target, e.g. only one firmware but multiple applications.</p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
@@ -901,14 +905,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Content-Length: 393
 Content-Type: application/json;charset=UTF-8
-Content-Length: 391
 
 [ {
   "createdBy" : "uploadTester",
-  "createdAt" : 1539329425165,
+  "createdAt" : 1549349062173,
   "lastModifiedBy" : "uploadTester",
-  "lastModifiedAt" : 1539329425165,
+  "lastModifiedAt" : 1549349062173,
   "name" : "TestName1",
   "description" : "Desc1",
   "key" : "test1",
@@ -916,10 +920,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/24"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/375"
     }
   },
-  "id" : 24
+  "id" : 375
 } ]</code></pre>
 </div>
 </div>
@@ -1006,7 +1010,7 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes/8' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes/359' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -1014,7 +1018,7 @@
 <h4 id="_request_url_3"><a class="link" href="#_request_url_3">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremoduletypes/8 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/softwaremoduletypes/359 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -1123,7 +1127,8 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes/16' -i -H 'Accept: application/json'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes/367' -i -X GET \
+    -H 'Accept: application/json'</code></pre>
 </div>
 </div>
 </div>
@@ -1131,7 +1136,7 @@
 <h4 id="_request_url_4"><a class="link" href="#_request_url_4">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremoduletypes/16 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/softwaremoduletypes/367 HTTP/1.1
 Accept: application/json
 Host: management-api.host.com</code></pre>
 </div>
@@ -1247,14 +1252,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 392
 Content-Type: application/json;charset=UTF-8
-Content-Length: 390
 
 {
   "createdBy" : "uploadTester",
-  "createdAt" : 1539329425034,
+  "createdAt" : 1549349061986,
   "lastModifiedBy" : "uploadTester",
-  "lastModifiedAt" : 1539329425036,
+  "lastModifiedAt" : 1549349061989,
   "name" : "test123",
   "description" : "Desc1234",
   "key" : "test123",
@@ -1262,10 +1267,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/16"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/367"
     }
   },
-  "id" : 16
+  "id" : 367
 }</code></pre>
 </div>
 </div>
@@ -1337,7 +1342,9 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes/12' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/softwaremoduletypes/363' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "description" : "a new description"
 }'</code></pre>
 </div>
@@ -1347,10 +1354,10 @@
 <h4 id="_request_url_5"><a class="link" href="#_request_url_5">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/softwaremoduletypes/12 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/softwaremoduletypes/363 HTTP/1.1
+Content-Length: 41
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 41
 
 {
   "description" : "a new description"
@@ -1499,13 +1506,13 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 387
+Content-Length: 389
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329424951,
+  "createdAt" : 1549349061899,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329424955,
+  "lastModifiedAt" : 1549349061906,
   "name" : "test123",
   "description" : "a new description",
   "key" : "test123",
@@ -1513,10 +1520,10 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/12"
+      "href" : "https://management-api.host.com/rest/v1/softwaremoduletypes/363"
     }
   },
-  "id" : 12
+  "id" : 363
 }</code></pre>
 </div>
 </div>
diff --git a/rest-api/targetfilters-api-guide/index.html b/rest-api/targetfilters-api-guide/index.html
index e97de64..2baeb0f 100644
--- a/rest-api/targetfilters-api-guide/index.html
+++ b/rest-api/targetfilters-api-guide/index.html
@@ -448,7 +448,7 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -602,17 +602,17 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 411
+Content-Length: 412
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329377513,
+    "createdAt" : 1549349001493,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329377527,
+    "lastModifiedAt" : 1549349001507,
     "name" : "filter1",
     "query" : "name==*",
-    "autoAssignDistributionSet" : 2,
+    "autoAssignDistributionSet" : 13,
     "_links" : {
       "self" : {
         "href" : "https://management-api.host.com/rest/v1/targetfilters/2"
@@ -693,7 +693,9 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters' -i -X POST -H 'Content-Type: application/json' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters' -i -X POST \
+    -H 'Content-Type: application/json' \
+    -d '{
   "query" : "name==*",
   "name" : "filter1"
 }'</code></pre>
@@ -706,8 +708,8 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targetfilters HTTP/1.1
 Content-Type: application/json
-Host: management-api.host.com
 Content-Length: 47
+Host: management-api.host.com
 
 {
   "query" : "name==*",
@@ -836,14 +838,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 451
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329377712,
+  "createdAt" : 1549349001695,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329377712,
+  "lastModifiedAt" : 1549349001695,
   "name" : "filter1",
   "query" : "name==*",
   "autoAssignDistributionSet" : null,
@@ -1054,7 +1056,7 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/5' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/5' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -1171,17 +1173,17 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 449
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 448
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329378043,
+  "createdAt" : 1549349002190,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329378055,
+  "lastModifiedAt" : 1549349002206,
   "name" : "filter1",
   "query" : "name==*",
-  "autoAssignDistributionSet" : 3,
+  "autoAssignDistributionSet" : 14,
   "_links" : {
     "self" : {
       "href" : "https://management-api.host.com/rest/v1/targetfilters/5"
@@ -1267,7 +1269,9 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/4' -i -X PUT -H 'Content-Type: application/json' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/4' -i -X PUT \
+    -H 'Content-Type: application/json' \
+    -d '{
   "query" : "attribute.hwRevision==2",
   "name" : "newFilterName"
 }'</code></pre>
@@ -1280,8 +1284,8 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/targetfilters/4 HTTP/1.1
 Content-Type: application/json
-Host: management-api.host.com
 Content-Length: 69
+Host: management-api.host.com
 
 {
   "query" : "attribute.hwRevision==2",
@@ -1431,14 +1435,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 473
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329377842,
+  "createdAt" : 1549349001865,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329377854,
+  "lastModifiedAt" : 1549349001886,
   "name" : "newFilterName",
   "query" : "attribute.hwRevision==2",
   "autoAssignDistributionSet" : null,
@@ -1537,7 +1541,7 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/8/autoAssignDS' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/8/autoAssignDS' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -1643,7 +1647,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1691,67 +1695,67 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 2370
+Content-Length: 2373
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329378487,
+  "createdAt" : 1549349003010,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329378492,
+  "lastModifiedAt" : 1549349003023,
   "name" : "DS",
   "description" : "The descption of the distribution set.",
   "version" : "1.0",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329378465,
+    "createdAt" : 1549349002973,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329378505,
+    "lastModifiedAt" : 1549349003082,
     "name" : "application",
     "description" : "Description of the software module",
-    "version" : "1.0.59",
+    "version" : "1.0.68",
     "type" : "application",
     "vendor" : "vendor Limited, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/13"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/46"
       }
     },
-    "id" : 13
+    "id" : 46
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329378470,
+    "createdAt" : 1549349002982,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329378517,
+    "lastModifiedAt" : 1549349003048,
     "name" : "app runtime",
     "description" : "Description of the software module",
-    "version" : "1.0.28",
+    "version" : "1.0.64",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/14"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/47"
       }
     },
-    "id" : 14
+    "id" : 47
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329378475,
+    "createdAt" : 1549349002990,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329378530,
+    "lastModifiedAt" : 1549349003064,
     "name" : "Firmware",
     "description" : "Description of the software module",
-    "version" : "1.0.21",
+    "version" : "1.0.5",
     "type" : "os",
     "vendor" : "vendor Limited Inc, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/15"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/48"
       }
     },
-    "id" : 15
+    "id" : 48
   } ],
   "requiredMigrationStep" : false,
   "type" : "test_default_ds_type",
@@ -1759,21 +1763,21 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/16"
     },
     "modules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5/assignedSM?offset=0&amp;limit=50{&amp;sort}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/16/assignedSM?offset=0&amp;limit=50{&amp;sort}",
       "templated" : true
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/36"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/76"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/16/metadata?offset=0&amp;limit=50{&amp;sort,q}",
       "templated" : true
     }
   },
-  "id" : 5
+  "id" : 16
 }</code></pre>
 </div>
 </div>
@@ -1846,8 +1850,10 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/7/autoAssignDS' -i -X POST -H 'Content-Type: application/json' -d '{
-  "id" : "4"
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targetfilters/7/autoAssignDS' -i -X POST \
+    -H 'Content-Type: application/json' \
+    -d '{
+  "id" : "15"
 }'</code></pre>
 </div>
 </div>
@@ -1857,12 +1863,12 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targetfilters/7/autoAssignDS HTTP/1.1
+Content-Length: 17
 Content-Type: application/json
 Host: management-api.host.com
-Content-Length: 16
 
 {
-  "id" : "4"
+  "id" : "15"
 }</code></pre>
 </div>
 </div>
@@ -2001,17 +2007,17 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 449
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 448
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329378262,
+  "createdAt" : 1549349002577,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329378360,
+  "lastModifiedAt" : 1549349002759,
   "name" : "filter1",
   "query" : "name==*",
-  "autoAssignDistributionSet" : 4,
+  "autoAssignDistributionSet" : 15,
   "_links" : {
     "self" : {
       "href" : "https://management-api.host.com/rest/v1/targetfilters/7"
diff --git a/rest-api/targets-api-guide/index.html b/rest-api/targets-api-guide/index.html
index 1d34fe3..b1e8c2b 100644
--- a/rest-api/targets-api-guide/index.html
+++ b/rest-api/targets-api-guide/index.html
@@ -434,6 +434,11 @@
 <li><a href="#_post_rest_v1_targets_targetid_assignedds">POST /rest/v1/targets/{targetId}/assignedDS</a></li>
 <li><a href="#_get_rest_v1_targets_targetid_attributes">GET /rest/v1/targets/{targetId}/attributes</a></li>
 <li><a href="#_get_rest_v1_targets_targetid_installedds">GET /rest/v1/targets/{targetId}/installedDS</a></li>
+<li><a href="#_get_rest_v1_targets_targetid_metadata">GET /rest/v1/targets/{targetId}/metadata</a></li>
+<li><a href="#_post_rest_v1_targets_targetid_metadata">POST /rest/v1/targets/{targetId}/metadata</a></li>
+<li><a href="#_delete_rest_v1_targets_targetid_metadata_metadatakey">DELETE /rest/v1/targets/{targetId}/metadata/{metadataKey}</a></li>
+<li><a href="#_get_rest_v1_targets_targetid_metadata_metadatakey">GET /rest/v1/targets/{targetId}/metadata/{metadataKey}</a></li>
+<li><a href="#_put_rest_v1_targets_targetid_metadata_metadatakey">PUT /rest/v1/targets/{targetId}/metadata/{metadataKey}</a></li>
 <li><a href="#_additional_content">Additional content</a></li>
 </ul>
 </div>
@@ -454,7 +459,7 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -626,7 +631,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">content[].ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -649,18 +654,18 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329412098,
+    "createdAt" : 1549349044307,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412116,
+    "lastModifiedAt" : 1549349044335,
     "name" : "137",
     "description" : "My name is 137",
     "controllerId" : "137",
     "updateStatus" : "in_sync",
-    "lastControllerRequestAt" : 1539329412097,
-    "installedAt" : 1539329412114,
+    "lastControllerRequestAt" : 1549349044306,
+    "installedAt" : 1549349044330,
     "ipAddress" : "192.168.0.1",
     "address" : "http://192.168.0.1",
-    "securityToken" : "15a87b645eb9c92a00ba9b48520387cf",
+    "securityToken" : "81dff76b39b0db8341ea8d36beba32fb",
     "requestAttributes" : true,
     "_links" : {
       "self" : {
@@ -741,7 +746,9 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "securityToken" : "2345678DGGDGFTDzztgf",
   "address" : "https://192.168.0.1",
   "controllerId" : "123456",
@@ -757,8 +764,8 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targets HTTP/1.1
 Content-Type: application/json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 169
+Host: management-api.host.com
 
 [ {
   "securityToken" : "2345678DGGDGFTDzztgf",
@@ -894,7 +901,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">[]ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -934,9 +941,9 @@
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329411850,
+  "createdAt" : 1549349043836,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329411850,
+  "lastModifiedAt" : 1549349043836,
   "name" : "controllerId",
   "description" : "test",
   "controllerId" : "123456",
@@ -1059,8 +1066,8 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name  of the entity</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
 </table>
@@ -1148,7 +1155,7 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -1176,7 +1183,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -1278,7 +1285,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1335,6 +1342,12 @@
 <td class="tableblock halign-left valign-top"><p class="tableblock">Links to actions of the target.</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">_links.metadata</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Object</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">List of metadata.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
 </tbody>
 </table>
 </div>
@@ -1344,27 +1357,27 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 1164
+Content-Length: 1321
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329412836,
+  "createdAt" : 1549349046079,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329412852,
+  "lastModifiedAt" : 1549349046106,
   "name" : "137",
   "description" : "My name is 137",
   "controllerId" : "137",
   "updateStatus" : "in_sync",
-  "lastControllerRequestAt" : 1539329412835,
-  "installedAt" : 1539329412849,
+  "lastControllerRequestAt" : 1549349046078,
+  "installedAt" : 1549349046102,
   "ipAddress" : "192.168.0.1",
   "address" : "http://192.168.0.1",
   "pollStatus" : {
-    "lastRequestAt" : 1539329412835,
-    "nextExpectedRequestAt" : 1539372612835,
+    "lastRequestAt" : 1549349046078,
+    "nextExpectedRequestAt" : 1549392246078,
     "overdue" : false
   },
-  "securityToken" : "7b87f916d0092b1c547b54fc41863a7a",
+  "securityToken" : "5884d1e472ea21089608e7d17637d503",
   "requestAttributes" : true,
   "_links" : {
     "self" : {
@@ -1381,6 +1394,10 @@
     },
     "actions" : {
       "href" : "https://management-api.host.com/rest/v1/targets/137/actions?offset=0&amp;limit=50&amp;sort=id:DESC"
+    },
+    "metadata" : {
+      "href" : "https://management-api.host.com/rest/v1/targets/137/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "templated" : true
     }
   }
 }</code></pre>
@@ -1459,7 +1476,9 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "securityToken" : "2345678DGGDGFTDzztgf",
   "requestAttributes" : true,
   "address" : "https://192.168.0.1",
@@ -1475,9 +1494,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/targets/137 HTTP/1.1
+Content-Length: 206
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 206
 
 {
   "securityToken" : "2345678DGGDGFTDzztgf",
@@ -1505,7 +1524,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -1672,7 +1691,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1729,6 +1748,12 @@
 <td class="tableblock halign-left valign-top"><p class="tableblock">Links to actions of the target.</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">_links.metadata</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Object</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">List of metadata.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
 </tbody>
 </table>
 </div>
@@ -1738,24 +1763,24 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 1166
+Content-Length: 1323
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329412227,
+  "createdAt" : 1549349044528,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329412254,
+  "lastModifiedAt" : 1549349044564,
   "name" : "newTargetName",
   "description" : "I've been updated",
   "controllerId" : "137",
   "updateStatus" : "in_sync",
-  "lastControllerRequestAt" : 1539329412226,
-  "installedAt" : 1539329412237,
+  "lastControllerRequestAt" : 1549349044527,
+  "installedAt" : 1549349044548,
   "ipAddress" : "192.168.0.1",
   "address" : "https://192.168.0.1",
   "pollStatus" : {
-    "lastRequestAt" : 1539329412226,
-    "nextExpectedRequestAt" : 1539372612226,
+    "lastRequestAt" : 1549349044527,
+    "nextExpectedRequestAt" : 1549392244527,
     "overdue" : false
   },
   "securityToken" : "2345678DGGDGFTDzztgf",
@@ -1775,6 +1800,10 @@
     },
     "actions" : {
       "href" : "https://management-api.host.com/rest/v1/targets/137/actions?offset=0&amp;limit=50&amp;sort=id:DESC"
+    },
+    "metadata" : {
+      "href" : "https://management-api.host.com/rest/v1/targets/137/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "templated" : true
     }
   }
 }</code></pre>
@@ -1863,7 +1892,7 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -1891,7 +1920,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -2070,18 +2099,18 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329412725,
+    "createdAt" : 1549349045581,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412734,
+    "lastModifiedAt" : 1549349045599,
     "type" : "update",
     "status" : "finished",
     "forceType" : "forced",
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/targets/137/actions/11"
+        "href" : "https://management-api.host.com/rest/v1/targets/137/actions/68"
       }
     },
-    "id" : 11
+    "id" : 68
   } ],
   "total" : 1,
   "size" : 1
@@ -2094,30 +2123,30 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 582
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 584
 
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329413183,
+    "createdAt" : 1549349047204,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329413191,
+    "lastModifiedAt" : 1549349047227,
     "type" : "update",
     "status" : "finished",
     "forceType" : "forced",
     "maintenanceWindow" : {
-      "schedule" : "0 32 9 12 10 ? 2018",
+      "schedule" : "7 46 7 5 2 ? 2019",
       "duration" : "00:01:00",
-      "timezone" : "+02:00",
-      "nextStartAt" : 1539329520000
+      "timezone" : "+01:00",
+      "nextStartAt" : 1549349167000
     },
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/targets/137/actions/15"
+        "href" : "https://management-api.host.com/rest/v1/targets/137/actions/72"
       }
     },
-    "id" : 15
+    "id" : 72
   } ],
   "total" : 1,
   "size" : 1
@@ -2192,7 +2221,9 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/5' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/62' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "forceType" : "forced"
 }'</code></pre>
 </div>
@@ -2202,10 +2233,10 @@
 <h4 id="_request_url_7"><a class="link" href="#_request_url_7">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/targets/137/actions/5 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/targets/137/actions/62 HTTP/1.1
+Content-Length: 28
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 28
 
 {
   "forceType" : "forced"
@@ -2228,7 +2259,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 <tr>
@@ -2357,29 +2388,29 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 583
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 579
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329411995,
+  "createdAt" : 1549349044094,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329412005,
+  "lastModifiedAt" : 1549349044112,
   "type" : "update",
   "status" : "pending",
   "forceType" : "forced",
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/5"
+      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/62"
     },
     "distributionset" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/5"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/70"
     },
     "status" : {
-      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/5/status?offset=0&amp;limit=50&amp;sort=id:DESC"
+      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/62/status?offset=0&amp;limit=50&amp;sort=id:DESC"
     }
   },
-  "id" : 5
+  "id" : 62
 }</code></pre>
 </div>
 </div>
@@ -2466,7 +2497,7 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/4' -i -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/61' -i -X DELETE</code></pre>
 </div>
 </div>
 </div>
@@ -2474,7 +2505,7 @@
 <h4 id="_request_url_8"><a class="link" href="#_request_url_8">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/targets/137/actions/4 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/targets/137/actions/61 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2494,7 +2525,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 <tr>
@@ -2617,7 +2648,7 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/14' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/71' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -2625,7 +2656,7 @@
 <h4 id="_request_url_9"><a class="link" href="#_request_url_9">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/actions/14 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/actions/71 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2645,7 +2676,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 <tr>
@@ -2780,30 +2811,30 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 619
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329413079,
+  "createdAt" : 1549349046806,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329413086,
+  "lastModifiedAt" : 1549349046824,
   "type" : "update",
   "status" : "finished",
-  "forceTime" : 1539329413076,
+  "forceTime" : 1549349046799,
   "forceType" : "timeforced",
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/14"
+      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/71"
     },
     "distributionset" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/14"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/79"
     },
     "status" : {
-      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/14/status?offset=0&amp;limit=50&amp;sort=id:DESC"
+      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/71/status?offset=0&amp;limit=50&amp;sort=id:DESC"
     }
   },
-  "id" : 14
+  "id" : 71
 }</code></pre>
 </div>
 </div>
@@ -2814,35 +2845,35 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 776
+Content-Length: 778
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329411167,
+  "createdAt" : 1549349042723,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329411207,
+  "lastModifiedAt" : 1549349042827,
   "type" : "update",
   "status" : "finished",
-  "forceTime" : 1539329411143,
+  "forceTime" : 1549349042652,
   "forceType" : "timeforced",
   "maintenanceWindow" : {
-    "schedule" : "0 32 9 12 10 ? 2018",
+    "schedule" : "2 46 7 5 2 ? 2019",
     "duration" : "00:01:00",
-    "timezone" : "+02:00",
-    "nextStartAt" : 1539329520000
+    "timezone" : "+01:00",
+    "nextStartAt" : 1549349162000
   },
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/1"
+      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/58"
     },
     "distributionset" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/1"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/66"
     },
     "status" : {
-      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/1/status?offset=0&amp;limit=50&amp;sort=id:DESC"
+      "href" : "https://management-api.host.com/rest/v1/targets/137/actions/58/status?offset=0&amp;limit=50&amp;sort=id:DESC"
     }
   },
-  "id" : 1
+  "id" : 58
 }</code></pre>
 </div>
 </div>
@@ -2919,7 +2950,7 @@
 <h4 id="_curl_10"><a class="link" href="#_curl_10">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/2/status' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/actions/59/status' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -2927,7 +2958,7 @@
 <h4 id="_request_url_10"><a class="link" href="#_request_url_10">Request URL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/actions/2/status HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/actions/59/status HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -2947,7 +2978,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 <tr>
@@ -2990,7 +3021,7 @@
 <h4 id="_request_parameter_example_4"><a class="link" href="#_request_parameter_example_4">Request parameter example</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/actions/8/status?limit=10&amp;sort=id:ASC&amp;offset=0 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/actions/65/status?limit=10&amp;sort=id:ASC&amp;offset=0 HTTP/1.1
 Host: management-api.host.com</code></pre>
 </div>
 </div>
@@ -3066,20 +3097,20 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 262
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 260
 
 {
   "content" : [ {
     "type" : "finished",
     "messages" : [ null ],
-    "reportedAt" : 1539329411362,
-    "id" : 4
+    "reportedAt" : 1549349043095,
+    "id" : 31
   }, {
     "type" : "running",
     "messages" : [ null ],
-    "reportedAt" : 1539329411355,
-    "id" : 3
+    "reportedAt" : 1549349043085,
+    "id" : 30
   } ],
   "total" : 2,
   "size" : 2
@@ -3159,7 +3190,7 @@
 <h4 id="_curl_11"><a class="link" href="#_curl_11">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/assignedDS' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/assignedDS' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -3187,7 +3218,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -3265,7 +3296,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -3312,68 +3343,68 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 2381
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 2374
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329412569,
+  "createdAt" : 1549349045272,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329412571,
+  "lastModifiedAt" : 1549349045278,
   "name" : "DS",
   "description" : "The descption of the distribution set.",
   "version" : "1.0",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329412563,
+    "createdAt" : 1549349045252,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412578,
+    "lastModifiedAt" : 1549349045295,
     "name" : "Firmware",
     "description" : "Description of the software module",
-    "version" : "1.0.81",
+    "version" : "1.0.60",
     "type" : "os",
     "vendor" : "vendor Limited Inc, California",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/30"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/232"
       }
     },
-    "id" : 30
+    "id" : 232
   }, {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329412559,
+    "createdAt" : 1549349045245,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412584,
-    "name" : "application",
-    "description" : "Description of the software module",
-    "version" : "1.0.21",
-    "type" : "application",
-    "vendor" : "vendor Limited, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/28"
-      }
-    },
-    "id" : 28
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329412561,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412590,
+    "lastModifiedAt" : 1549349045323,
     "name" : "app runtime",
     "description" : "Description of the software module",
-    "version" : "1.0.44",
+    "version" : "1.0.47",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/29"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/231"
       }
     },
-    "id" : 29
+    "id" : 231
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349045239,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349045309,
+    "name" : "application",
+    "description" : "Description of the software module",
+    "version" : "1.0.84",
+    "type" : "application",
+    "vendor" : "vendor Limited, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/230"
+      }
+    },
+    "id" : 230
   } ],
   "requiredMigrationStep" : false,
   "type" : "test_default_ds_type",
@@ -3381,21 +3412,21 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/10"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/75"
     },
     "modules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/10/assignedSM?offset=0&amp;limit=50{&amp;sort}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/75/assignedSM?offset=0&amp;limit=50{&amp;sort}",
       "templated" : true
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/56"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/360"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/10/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/75/metadata?offset=0&amp;limit=50{&amp;sort,q}",
       "templated" : true
     }
   },
-  "id" : 10
+  "id" : 75
 }</code></pre>
 </div>
 </div>
@@ -3472,14 +3503,16 @@
 <h4 id="_curl_12"><a class="link" href="#_curl_12">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/assignedDS' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/assignedDS' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "3 24 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329411465,
-  "id" : 3,
+  "forcetime" : 1549349043262,
+  "id" : 68,
   "type" : "timeforced"
 }'</code></pre>
 </div>
@@ -3500,7 +3533,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -3604,18 +3637,18 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targets/137/assignedDS HTTP/1.1
+Content-Length: 195
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 196
 
 {
   "maintenanceWindow" : {
     "duration" : "00:10:00",
-    "schedule" : "0 40 9 12 10 ? 2018",
-    "timezone" : "+02:00"
+    "schedule" : "3 24 9 5 2 ? 2019",
+    "timezone" : "+01:00"
   },
-  "forcetime" : 1539329411465,
-  "id" : 3,
+  "forcetime" : 1549349043262,
+  "id" : 68,
   "type" : "timeforced"
 }</code></pre>
 </div>
@@ -3629,8 +3662,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 60
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "assigned" : 1,
@@ -3722,7 +3755,7 @@
 <h4 id="_curl_13"><a class="link" href="#_curl_13">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/attributes' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/attributes' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -3750,7 +3783,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -3846,7 +3879,7 @@
 <h4 id="_curl_14"><a class="link" href="#_curl_14">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/installedDS' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/installedDS' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -3874,7 +3907,7 @@
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">controllerId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
 </tr>
 </tbody>
@@ -3952,7 +3985,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">requiredMigrationStep</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS a required migration step. As a result the DS will be installed even when a newer. (note: updatable only if DS is not yet assigned to a target)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">True if DS is a required migration step for another DS. As a result the DS&#8217;s assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -3999,68 +4032,68 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 2380
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 2370
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329412459,
+  "createdAt" : 1549349044994,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329412461,
+  "lastModifiedAt" : 1549349045000,
   "name" : "DS",
   "description" : "The descption of the distribution set.",
   "version" : "1.0",
   "modules" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329412453,
+    "createdAt" : 1549349044973,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412479,
-    "name" : "Firmware",
-    "description" : "Description of the software module",
-    "version" : "1.0.71",
-    "type" : "os",
-    "vendor" : "vendor Limited Inc, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/27"
-      }
-    },
-    "id" : 27
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329412447,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412467,
-    "name" : "application",
-    "description" : "Description of the software module",
-    "version" : "1.0.71",
-    "type" : "application",
-    "vendor" : "vendor Limited, California",
-    "deleted" : false,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/25"
-      }
-    },
-    "id" : 25
-  }, {
-    "createdBy" : "bumlux",
-    "createdAt" : 1539329412450,
-    "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329412473,
+    "lastModifiedAt" : 1549349045035,
     "name" : "app runtime",
     "description" : "Description of the software module",
-    "version" : "1.0.61",
+    "version" : "1.0.5",
     "type" : "runtime",
     "vendor" : "vendor GmbH, Stuttgart, Germany",
     "deleted" : false,
     "_links" : {
       "self" : {
-        "href" : "https://management-api.host.com/rest/v1/softwaremodules/26"
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/228"
       }
     },
-    "id" : 26
+    "id" : 228
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349044967,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349045051,
+    "name" : "application",
+    "description" : "Description of the software module",
+    "version" : "1.0.67",
+    "type" : "application",
+    "vendor" : "vendor Limited, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/227"
+      }
+    },
+    "id" : 227
+  }, {
+    "createdBy" : "bumlux",
+    "createdAt" : 1549349044980,
+    "lastModifiedBy" : "bumlux",
+    "lastModifiedAt" : 1549349045015,
+    "name" : "Firmware",
+    "description" : "Description of the software module",
+    "version" : "1.0.84",
+    "type" : "os",
+    "vendor" : "vendor Limited Inc, California",
+    "deleted" : false,
+    "_links" : {
+      "self" : {
+        "href" : "https://management-api.host.com/rest/v1/softwaremodules/229"
+      }
+    },
+    "id" : 229
   } ],
   "requiredMigrationStep" : false,
   "type" : "test_default_ds_type",
@@ -4068,21 +4101,21 @@
   "deleted" : false,
   "_links" : {
     "self" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/9"
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/74"
     },
     "modules" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/9/assignedSM?offset=0&amp;limit=50{&amp;sort}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/74/assignedSM?offset=0&amp;limit=50{&amp;sort}",
       "templated" : true
     },
     "type" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/52"
+      "href" : "https://management-api.host.com/rest/v1/distributionsettypes/356"
     },
     "metadata" : {
-      "href" : "https://management-api.host.com/rest/v1/distributionsets/9/metadata?offset=0&amp;limit=50{&amp;sort,q}",
+      "href" : "https://management-api.host.com/rest/v1/distributionsets/74/metadata?offset=0&amp;limit=50{&amp;sort,q}",
       "templated" : true
     }
   },
-  "id" : 9
+  "id" : 74
 }</code></pre>
 </div>
 </div>
@@ -4145,6 +4178,920 @@
 </div>
 </div>
 <div class="sect1">
+<h2 id="_get_rest_v1_targets_targetid_metadata"><a class="link" href="#_get_rest_v1_targets_targetid_metadata">GET /rest/v1/targets/{targetId}/metadata</a></h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_implementation_notes_15"><a class="link" href="#_implementation_notes_15">Implementation Notes</a></h3>
+<div class="paragraph">
+<p>Get a paged list of meta data for a target. Required permission: READ_REPOSITORY</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_get_a_paged_list_of_meta_data"><a class="link" href="#_get_a_paged_list_of_meta_data">Get a paged list of meta data</a></h3>
+<div class="sect3">
+<h4 id="_curl_15"><a class="link" href="#_curl_15">Curl</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/metadata' -i -X GET</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_url_15"><a class="link" href="#_request_url_15">Request URL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/metadata HTTP/1.1
+Host: management-api.host.com</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_path_parameter_13"><a class="link" href="#_request_path_parameter_13">Request path parameter</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_request_query_parameter_5"><a class="link" href="#_request_query_parameter_5">Request query parameter</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>limit</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The maximum number of entries in a page (default is 50).</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>sort</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The query parameter sort allows to define the sort order for the result of a query. A sort criteria consists of the name of a field and the sort direction (ASC for ascending and DESC descending). The sequence of the sort criteria (multiple can be used) defines the sort order of the entities in the result.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>offset</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The paging offset (default is 0).</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>q</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Query fields based on the Feed Item Query Language (FIQL). See Entity Definitions for available fields.</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_request_parameter_example_5"><a class="link" href="#_request_parameter_example_5">Request parameter example</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/metadata?offset=1&amp;limit=2&amp;sort=key%3ADESC&amp;q=key%3D%3Dknown* HTTP/1.1
+Host: management-api.host.com</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_response_status_200_13"><a class="link" href="#_response_status_200_13">Response (Status 200)</a></h3>
+<div class="sect3">
+<h4 id="_response_fields_11"><a class="link" href="#_response_fields_11">Response fields</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Path</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+<th class="tableblock halign-left valign-top">Allowed Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">total</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Number</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Total number of elements</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">size</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Number</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Current page size</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">content</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Array</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">List of metadata.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">content[].key</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property key.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">content[].value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property value.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_response_example_15"><a class="link" href="#_response_example_15">Response example</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Type: application/hal+json;charset=UTF-8
+Content-Length: 289
+
+{
+  "content" : [ {
+    "key" : "knownKey0",
+    "value" : "knownValue0"
+  }, {
+    "key" : "knownKey1",
+    "value" : "knownValue1"
+  }, {
+    "key" : "knownKey2",
+    "value" : "knownValue2"
+  }, {
+    "key" : "knownKey3",
+    "value" : "knownValue3"
+  } ],
+  "total" : 4,
+  "size" : 4
+}</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_error_responses_15"><a class="link" href="#_error_responses_15">Error responses</a></h3>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 33%;">
+<col style="width: 33%;">
+<col style="width: 33%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">HTTP Status Code</th>
+<th class="tableblock halign-left valign-top">Reason</th>
+<th class="tableblock halign-left valign-top">Response Model</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Bad Request - e.g. invalid parameters</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>401 Unauthorized</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request requires user authentication.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>403 Forbidden</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>405 Method Not Allowed</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The http request method is not allowed on the resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>406 Not Acceptable</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">In case accept header is specified and not application/json.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>429 Too Many Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Too many requests. The server will refuse further attempts and the client has to wait another second.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_post_rest_v1_targets_targetid_metadata"><a class="link" href="#_post_rest_v1_targets_targetid_metadata">POST /rest/v1/targets/{targetId}/metadata</a></h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_implementation_notes_16"><a class="link" href="#_implementation_notes_16">Implementation Notes</a></h3>
+<div class="paragraph">
+<p>Create a list of meta data entries Required permissions: READ_REPOSITORY and UPDATE_TARGET</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_create_a_list_of_meta_data_entries"><a class="link" href="#_create_a_list_of_meta_data_entries">Create a list of meta data entries</a></h3>
+<div class="sect3">
+<h4 id="_curl_16"><a class="link" href="#_curl_16">CURL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/metadata' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
+  "value" : "knownValue1",
+  "key" : "knownKey1"
+}, {
+  "value" : "knownValue2",
+  "key" : "knownKey2"
+} ]'</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_url_16"><a class="link" href="#_request_url_16">Request URL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targets/137/metadata HTTP/1.1
+Content-Length: 110
+Content-Type: application/json;charset=UTF-8
+Host: management-api.host.com
+
+[ {
+  "value" : "knownValue1",
+  "key" : "knownKey1"
+}, {
+  "value" : "knownValue2",
+  "key" : "knownKey2"
+} ]</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_path_parameter_14"><a class="link" href="#_request_path_parameter_14">Request path parameter</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_request_fields_5"><a class="link" href="#_request_fields_5">Request fields</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Path</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+<th class="tableblock halign-left valign-top">Allowed Values</th>
+<th class="tableblock halign-left valign-top">Mandatory</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">[]key</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property key.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">X</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">[]value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property value.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_response_status_200_14"><a class="link" href="#_response_status_200_14">Response (Status 200)</a></h3>
+<div class="sect3">
+<h4 id="_response_example_16"><a class="link" href="#_response_example_16">Response example</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Content-Length: 110
+Content-Type: application/hal+json;charset=UTF-8
+
+[ {
+  "key" : "knownKey1",
+  "value" : "knownValue1"
+}, {
+  "key" : "knownKey2",
+  "value" : "knownValue2"
+} ]</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_error_responses_16"><a class="link" href="#_error_responses_16">Error responses</a></h3>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 33%;">
+<col style="width: 33%;">
+<col style="width: 33%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">HTTP Status Code</th>
+<th class="tableblock halign-left valign-top">Reason</th>
+<th class="tableblock halign-left valign-top">Response Model</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Bad Request - e.g. invalid parameters</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>401 Unauthorized</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request requires user authentication.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>403 Forbidden</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>404 Not Found</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Not Found Target.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>405 Method Not Allowed</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The http request method is not allowed on the resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>406 Not Acceptable</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">In case accept header is specified and not application/json.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>409 Conflict</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>415 Unsupported Media Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request was attempt with a media-type which is not supported by the server for this resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>429 Too Many Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Too many requests. The server will refuse further attempts and the client has to wait another second.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_delete_rest_v1_targets_targetid_metadata_metadatakey"><a class="link" href="#_delete_rest_v1_targets_targetid_metadata_metadatakey">DELETE /rest/v1/targets/{targetId}/metadata/{metadataKey}</a></h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_implementation_notes_17"><a class="link" href="#_implementation_notes_17">Implementation Notes</a></h3>
+<div class="paragraph">
+<p>Delete a single meta data. Required permission: UPDATE_REPOSITORY</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_delete_a_single_meta_data"><a class="link" href="#_delete_a_single_meta_data">Delete a single meta data</a></h3>
+<div class="sect3">
+<h4 id="_curl_17"><a class="link" href="#_curl_17">CURL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/metadata/knownKey' -i -X DELETE</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_url_17"><a class="link" href="#_request_url_17">Request URL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /rest/v1/targets/137/metadata/knownKey HTTP/1.1
+Host: management-api.host.com</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_path_parameter_15"><a class="link" href="#_request_path_parameter_15">Request path parameter</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">key</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_response_status_200_15"><a class="link" href="#_response_status_200_15">Response (Status 200)</a></h3>
+<div class="sect3">
+<h4 id="_response_example_17"><a class="link" href="#_response_example_17">Response example</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_error_responses_17"><a class="link" href="#_error_responses_17">Error responses</a></h3>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 33%;">
+<col style="width: 33%;">
+<col style="width: 33%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">HTTP Status Code</th>
+<th class="tableblock halign-left valign-top">Reason</th>
+<th class="tableblock halign-left valign-top">Response Model</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Bad Request - e.g. invalid parameters</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>401 Unauthorized</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request requires user authentication.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>403 Forbidden</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>404 Not Found</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Not Found Target.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>405 Method Not Allowed</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The http request method is not allowed on the resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>406 Not Acceptable</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">In case accept header is specified and not application/json.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>429 Too Many Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Too many requests. The server will refuse further attempts and the client has to wait another second.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_get_rest_v1_targets_targetid_metadata_metadatakey"><a class="link" href="#_get_rest_v1_targets_targetid_metadata_metadatakey">GET /rest/v1/targets/{targetId}/metadata/{metadataKey}</a></h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_implementation_notes_18"><a class="link" href="#_implementation_notes_18">Implementation Notes</a></h3>
+<div class="paragraph">
+<p>Get a single meta data value for a meta data key. Required permission: READ_REPOSITORY</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_get_a_single_meta_data_value"><a class="link" href="#_get_a_single_meta_data_value">Get a single meta data value</a></h3>
+<div class="sect3">
+<h4 id="_curl_18"><a class="link" href="#_curl_18">Curl</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/metadata/knownKey' -i -X GET</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_url_18"><a class="link" href="#_request_url_18">Request URL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /rest/v1/targets/137/metadata/knownKey HTTP/1.1
+Host: management-api.host.com</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_path_parameter_16"><a class="link" href="#_request_path_parameter_16">Request path parameter</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">metadatakey</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_response_status_200_16"><a class="link" href="#_response_status_200_16">Response (Status 200)</a></h3>
+<div class="sect3">
+<h4 id="_response_fields_12"><a class="link" href="#_response_fields_12">Response fields</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Path</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+<th class="tableblock halign-left valign-top">Allowed Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">key</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property key.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property value.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_response_example_18"><a class="link" href="#_response_example_18">Response example</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 50
+Content-Type: application/json;charset=UTF-8
+
+{
+  "key" : "knownKey",
+  "value" : "knownValue"
+}</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_error_responses_18"><a class="link" href="#_error_responses_18">Error responses</a></h3>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 33%;">
+<col style="width: 33%;">
+<col style="width: 33%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">HTTP Status Code</th>
+<th class="tableblock halign-left valign-top">Reason</th>
+<th class="tableblock halign-left valign-top">Response Model</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Bad Request - e.g. invalid parameters</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>401 Unauthorized</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request requires user authentication.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>403 Forbidden</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>405 Method Not Allowed</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The http request method is not allowed on the resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>406 Not Acceptable</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">In case accept header is specified and not application/json.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>429 Too Many Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Too many requests. The server will refuse further attempts and the client has to wait another second.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_put_rest_v1_targets_targetid_metadata_metadatakey"><a class="link" href="#_put_rest_v1_targets_targetid_metadata_metadatakey">PUT /rest/v1/targets/{targetId}/metadata/{metadataKey}</a></h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_implementation_notes_19"><a class="link" href="#_implementation_notes_19">Implementation Notes</a></h3>
+<div class="paragraph">
+<p>Update a single meta data value for speficic key. Required permission: UPDATE_REPOSITORY</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_update_a_single_meta_data_value"><a class="link" href="#_update_a_single_meta_data_value">Update a single meta data value</a></h3>
+<div class="sect3">
+<h4 id="_curl_19"><a class="link" href="#_curl_19">Curl</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targets/137/metadata/knownKey' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
+  "value" : "valueForUpdate",
+  "key" : "knownKey"
+}'</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_url_19"><a class="link" href="#_request_url_19">Request URL</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/targets/137/metadata/knownKey HTTP/1.1
+Content-Length: 54
+Content-Type: application/json;charset=UTF-8
+Host: management-api.host.com
+
+{
+  "value" : "valueForUpdate",
+  "key" : "knownKey"
+}</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_request_path_parameter_17"><a class="link" href="#_request_path_parameter_17">Request path parameter</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">targetId</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">metadatakey</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The technical identifier   of the entity</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_request_fields_6"><a class="link" href="#_request_fields_6">Request fields</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Path</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+<th class="tableblock halign-left valign-top">Allowed Values</th>
+<th class="tableblock halign-left valign-top">Mandatory</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">key</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property key.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">X</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property value.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">X</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_response_status_200_17"><a class="link" href="#_response_status_200_17">Response (Status 200)</a></h3>
+<div class="sect3">
+<h4 id="_response_fields_13"><a class="link" href="#_response_fields_13">Response fields</a></h4>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Path</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+<th class="tableblock halign-left valign-top">Allowed Values</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">key</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property key.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metadata property value.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_response_example_19"><a class="link" href="#_response_example_19">Response example</a></h4>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 54
+Content-Type: application/hal+json;charset=UTF-8
+
+{
+  "key" : "knownKey",
+  "value" : "valueForUpdate"
+}</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_error_responses_19"><a class="link" href="#_error_responses_19">Error responses</a></h3>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 33%;">
+<col style="width: 33%;">
+<col style="width: 33%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">HTTP Status Code</th>
+<th class="tableblock halign-left valign-top">Reason</th>
+<th class="tableblock halign-left valign-top">Response Model</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Bad Request - e.g. invalid parameters</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>401 Unauthorized</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request requires user authentication.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>403 Forbidden</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>404 Not Found</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Not Found Target.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>405 Method Not Allowed</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The http request method is not allowed on the resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>406 Not Acceptable</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">In case accept header is specified and not application/json.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>409 Conflict</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">See <a href="#error-body">Error body</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>415 Unsupported Media Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The request was attempt with a media-type which is not supported by the server for this resource.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>429 Too Many Request</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Too many requests. The server will refuse further attempts and the client has to wait another second.</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_additional_content"><a class="link" href="#_additional_content">Additional content</a></h2>
 <div class="sectionbody">
 <div class="sect2">
@@ -4198,7 +5145,7 @@
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-06-11 15:04:18 +02:00
+Last updated 2018-11-19 11:32:00 +01:00
 </div>
 </div>
 </body>
diff --git a/rest-api/targettag-api-guide/index.html b/rest-api/targettag-api-guide/index.html
index 8e55cd1..3c0b3d3 100644
--- a/rest-api/targettag-api-guide/index.html
+++ b/rest-api/targettag-api-guide/index.html
@@ -449,7 +449,7 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -608,9 +608,9 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329431006,
+    "createdAt" : 1549349069116,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329431009,
+    "lastModifiedAt" : 1549349069120,
     "name" : "targetTag",
     "description" : "My name is targetTag",
     "colour" : "default",
@@ -694,7 +694,7 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/3' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/3' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -814,14 +814,14 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 504
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329430672,
+  "createdAt" : 1549349068633,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329430674,
+  "lastModifiedAt" : 1549349068637,
   "name" : "targetTag",
   "description" : "My name is targetTag",
   "colour" : "default",
@@ -906,7 +906,9 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "colour" : "red",
   "name" : "target tag",
   "description" : "target tag description"
@@ -919,9 +921,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targettags HTTP/1.1
+Content-Length: 95
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 95
 
 [ {
   "colour" : "red",
@@ -1057,9 +1059,9 @@
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329430273,
+  "createdAt" : 1549349067991,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329430273,
+  "lastModifiedAt" : 1549349067991,
   "name" : "target tag",
   "description" : "target tag description",
   "colour" : "red",
@@ -1150,7 +1152,9 @@
 <h4 id="_curl_4"><a class="link" href="#_curl_4">Curl</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/4' -i -X PUT -H 'Content-Type: application/json;charset=UTF-8' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/4' -i -X PUT \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '{
   "colour" : "red",
   "name" : "target tag",
   "description" : "target tag description"
@@ -1163,9 +1167,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/targettags/4 HTTP/1.1
+Content-Length: 91
 Content-Type: application/json;charset=UTF-8
 Host: management-api.host.com
-Content-Length: 91
 
 {
   "colour" : "red",
@@ -1328,9 +1332,9 @@
 
 {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329430789,
+  "createdAt" : 1549349068799,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329430796,
+  "lastModifiedAt" : 1549349068810,
   "name" : "target tag",
   "description" : "target tag description",
   "colour" : "red",
@@ -1430,7 +1434,8 @@
 <h4 id="_curl_5"><a class="link" href="#_curl_5">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/5' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/5' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -1548,7 +1553,8 @@
 <h4 id="_curl_6"><a class="link" href="#_curl_6">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/2/assigned' -i -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/2/assigned' -i -X GET \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
@@ -1679,7 +1685,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">content[].ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -1720,18 +1726,18 @@
 {
   "content" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329430449,
+    "createdAt" : 1549349068279,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329430549,
+    "lastModifiedAt" : 1549349068452,
     "name" : "Target1",
     "description" : "My name is Target1",
     "controllerId" : "Target1",
     "updateStatus" : "in_sync",
-    "lastControllerRequestAt" : 1539329430418,
-    "installedAt" : 1539329430534,
+    "lastControllerRequestAt" : 1549349068172,
+    "installedAt" : 1549349068431,
     "ipAddress" : "192.168.0.1",
     "address" : "http://192.168.0.1",
-    "securityToken" : "94e13188a23a96562cb614b4f6abc30e",
+    "securityToken" : "332be2ba22450b0c0aa8377d6d8b90a3",
     "requestAttributes" : true,
     "_links" : {
       "self" : {
@@ -1817,7 +1823,9 @@
 <h4 id="_curl_7"><a class="link" href="#_curl_7">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/10/assigned/toggleTagAssignment' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/10/assigned/toggleTagAssignment' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "controllerId" : "Target1"
 } ]'</code></pre>
 </div>
@@ -1829,8 +1837,8 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targettags/10/assigned/toggleTagAssignment HTTP/1.1
 Content-Type: application/json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 36
+Host: management-api.host.com
 
 [ {
   "controllerId" : "Target1"
@@ -1910,28 +1918,32 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 657
+Content-Length: 773
 
 {
   "assignedTargets" : [ {
     "createdBy" : "bumlux",
-    "createdAt" : 1539329431480,
+    "createdAt" : 1549349069817,
     "lastModifiedBy" : "bumlux",
-    "lastModifiedAt" : 1539329431500,
+    "lastModifiedAt" : 1549349069851,
     "name" : "Target1",
     "description" : "My name is Target1",
     "controllerId" : "Target1",
     "updateStatus" : "pending",
-    "lastControllerRequestAt" : 1539329431480,
+    "lastControllerRequestAt" : 1549349069816,
     "ipAddress" : "192.168.0.1",
     "address" : "http://192.168.0.1",
-    "securityToken" : "fc44555fcb40f6b1648d3f4de7371db4",
+    "securityToken" : "d935ca19ff71fc634d57cf178a2171cd",
     "requestAttributes" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/targets/Target1"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/targets/Target1",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   } ],
   "unassignedTargets" : [ ]
 }</code></pre>
@@ -2015,7 +2027,9 @@
 <h4 id="_curl_8"><a class="link" href="#_curl_8">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/8/assigned' -i -X POST -H 'Content-Type: application/json;charset=UTF-8' -d '[ {
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/8/assigned' -i -X POST \
+    -H 'Content-Type: application/json;charset=UTF-8' \
+    -d '[ {
   "controllerId" : "Target1"
 } ]'</code></pre>
 </div>
@@ -2027,8 +2041,8 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /rest/v1/targettags/8/assigned HTTP/1.1
 Content-Type: application/json;charset=UTF-8
-Host: management-api.host.com
 Content-Length: 36
+Host: management-api.host.com
 
 [ {
   "controllerId" : "Target1"
@@ -2162,7 +2176,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">[]ipAddress</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directy through DDI API).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API).</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
@@ -2184,18 +2198,18 @@
 
 [ {
   "createdBy" : "bumlux",
-  "createdAt" : 1539329431220,
+  "createdAt" : 1549349069432,
   "lastModifiedBy" : "bumlux",
-  "lastModifiedAt" : 1539329431242,
+  "lastModifiedAt" : 1549349069460,
   "name" : "Target1",
   "description" : "My name is Target1",
   "controllerId" : "Target1",
   "updateStatus" : "in_sync",
-  "lastControllerRequestAt" : 1539329431220,
-  "installedAt" : 1539329431232,
+  "lastControllerRequestAt" : 1549349069432,
+  "installedAt" : 1549349069447,
   "ipAddress" : "192.168.0.1",
   "address" : "http://192.168.0.1",
-  "securityToken" : "092ca0717b6118fd115cc6c5b60f4645",
+  "securityToken" : "f98b674a1d21adc197d502ab35f60103",
   "requestAttributes" : true,
   "_links" : {
     "self" : {
@@ -2283,7 +2297,8 @@
 <h4 id="_curl_9"><a class="link" href="#_curl_9">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/7/assigned/targetExist' -i -X DELETE -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/targettags/7/assigned/targetExist' -i -X DELETE \
+    -H 'Content-Type: application/json;charset=UTF-8'</code></pre>
 </div>
 </div>
 </div>
diff --git a/rest-api/tenant-api-guide/index.html b/rest-api/tenant-api-guide/index.html
index 381aad6..a249ed3 100644
--- a/rest-api/tenant-api-guide/index.html
+++ b/rest-api/tenant-api-guide/index.html
@@ -444,7 +444,7 @@
 <h4 id="_curl"><a class="link" href="#_curl">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/system/configs/' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/system/configs/' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -577,143 +577,203 @@
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/hal+json;charset=UTF-8
-Content-Length: 3489
+Content-Length: 5229
 
 {
   "anonymous.download.enabled" : {
     "value" : false,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/anonymous.download.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/anonymous.download.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "authentication.header.authority" : {
     "value" : "",
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.header.authority"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.header.authority",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "authentication.gatewaytoken.enabled" : {
     "value" : false,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "authentication.gatewaytoken.key" : {
     "value" : "",
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.key"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.key",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "action.cleanup.actionStatus" : {
     "value" : "CANCELED,ERROR",
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/action.cleanup.actionStatus"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/action.cleanup.actionStatus",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "action.cleanup.enabled" : {
     "value" : false,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/action.cleanup.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/action.cleanup.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "pollingTime" : {
     "value" : "12:00:00",
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/pollingTime"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/pollingTime",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "authentication.targettoken.enabled" : {
     "value" : false,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.targettoken.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.targettoken.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "rollout.approval.enabled" : {
     "value" : false,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/rollout.approval.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/rollout.approval.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "maintenanceWindowPollCount" : {
     "value" : 3,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/maintenanceWindowPollCount"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/maintenanceWindowPollCount",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "repository.actions.autoclose.enabled" : {
     "value" : false,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/repository.actions.autoclose.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/repository.actions.autoclose.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "action.cleanup.actionExpiry" : {
     "value" : 2592000000,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/action.cleanup.actionExpiry"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/action.cleanup.actionExpiry",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "pollingOverdueTime" : {
     "value" : "23:59:59",
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/pollingOverdueTime"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/pollingOverdueTime",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "authentication.header.enabled" : {
     "value" : true,
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.header.enabled"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/authentication.header.enabled",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   },
   "minPollingTime" : {
     "value" : "00:00:30",
     "global" : true,
-    "_links" : {
-      "self" : {
-        "href" : "https://management-api.host.com/rest/v1/system/configs/minPollingTime"
-      }
-    }
+    "links" : [ {
+      "rel" : "self",
+      "href" : "https://management-api.host.com/rest/v1/system/configs/minPollingTime",
+      "hreflang" : null,
+      "media" : null,
+      "title" : null,
+      "type" : null,
+      "deprecation" : null
+    } ]
   }
 }</code></pre>
 </div>
@@ -791,7 +851,7 @@
 <h4 id="_curl_2"><a class="link" href="#_curl_2">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.key/' -i</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.key/' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -890,8 +950,8 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Type: application/hal+json;charset=UTF-8
 Content-Length: 182
+Content-Type: application/hal+json;charset=UTF-8
 
 {
   "value" : "",
@@ -977,7 +1037,9 @@
 <h4 id="_curl_3"><a class="link" href="#_curl_3">CURL</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.key/' -i -X PUT -H 'Content-Type: application/json' -d '{
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://management-api.host.com/rest/v1/system/configs/authentication.gatewaytoken.key/' -i -X PUT \
+    -H 'Content-Type: application/json' \
+    -d '{
   "value" : "exampleToken"
 }'</code></pre>
 </div>
@@ -988,9 +1050,9 @@
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /rest/v1/system/configs/authentication.gatewaytoken.key/ HTTP/1.1
+Content-Length: 30
 Content-Type: application/json
 Host: management-api.host.com
-Content-Length: 30
 
 {
   "value" : "exampleToken"
@@ -1119,9 +1181,9 @@
 
 {
   "value" : "exampleToken",
-  "lastModifiedAt" : 1539329436367,
+  "lastModifiedAt" : 1549349075288,
   "lastModifiedBy" : "bumlux",
-  "createdAt" : 1539329436367,
+  "createdAt" : 1549349075288,
   "createdBy" : "bumlux",
   "global" : false,
   "_links" : {
diff --git a/sandbox/index.html b/sandbox/index.html
index e2f4aea..099cc6a 100644
--- a/sandbox/index.html
+++ b/sandbox/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Sandbox - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -413,7 +413,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/tags/index.html b/tags/index.html
index 7a13d01..c277833 100644
--- a/tags/index.html
+++ b/tags/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Tags - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -416,7 +416,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/ui/index.html b/ui/index.html
index a4b8731..1aa700f 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Management UI - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -641,7 +641,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>
diff --git a/whatishawkbit/index.html b/whatishawkbit/index.html
index f869126..e2f021a 100644
--- a/whatishawkbit/index.html
+++ b/whatishawkbit/index.html
@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>What is hawkBit? - Eclipse hawkBit</title>
-    <meta name="generator" content="Hugo 0.49.2" />
+    <meta name="generator" content="Hugo 0.54.0" />
 
     
     <meta name="description" content="IoT. Update. Device.">
@@ -462,7 +462,7 @@
   </div>
   <p class="notice">
     
-    &copy; 2018 The Eclipse hawkBit Project &ndash;
+    &copy; 2019 The Eclipse hawkBit Project &ndash;
     
     Documentation built with
     <a href="https://www.gohugo.io" target="_blank">Hugo</a>