diff --git a/KUBERNETES/Generic/.meta_Nodes.xml b/KUBERNETES/Generic/.meta_Nodes.xml
old mode 100644
new mode 100755
index c9b675e9..ada3e7a8
--- a/KUBERNETES/Generic/.meta_Nodes.xml
+++ b/KUBERNETES/Generic/.meta_Nodes.xml
@@ -3,7 +3,7 @@
     <map>
         <entry>
             <key>DATE_MODIFICATION</key>
-            <value>1605535459377</value>
+            <value>1611163277610</value>
         </entry>
         <entry>
             <key>REPOSITORY</key>
@@ -11,19 +11,18 @@
         </entry>
         <entry>
             <key>DATE_CREATION</key>
-            <value>1605535459251</value>
+            <value>1611163277603</value>
         </entry>
         <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
+            <key>MODEL</key>
+            <value>20060101</value>
         </entry>
         <entry>
             <key>TAG</key>
-            <value>string</value>
         </entry>
         <entry>
-            <key>MODEL</key>
-            <value>20060101</value>
+            <key>FILE_TYPE</key>
+            <value>text</value>
         </entry>
         <entry>
             <key>MANUFACTURER</key>
@@ -35,7 +34,6 @@
         </entry>
         <entry>
             <key>COMMENT</key>
-            <value>string</value>
         </entry>
     </map>
 </metadata>
diff --git a/KUBERNETES/Generic/.meta_k8_pods_list.xml b/KUBERNETES/Generic/.meta_k8_pods_list.xml
index 8526ce6d..5f0e7aa8 100755
--- a/KUBERNETES/Generic/.meta_k8_pods_list.xml
+++ b/KUBERNETES/Generic/.meta_k8_pods_list.xml
@@ -3,7 +3,7 @@
     <map>
         <entry>
             <key>DATE_MODIFICATION</key>
-            <value>1605543793138</value>
+            <value>1611163357226</value>
         </entry>
         <entry>
             <key>REPOSITORY</key>
@@ -11,7 +11,7 @@
         </entry>
         <entry>
             <key>DATE_CREATION</key>
-            <value>1605543793131</value>
+            <value>1611163357219</value>
         </entry>
         <entry>
             <key>MODEL</key>
diff --git a/KUBERNETES/Generic/Nodes.xml b/KUBERNETES/Generic/Nodes.xml
index 452329de..e894d6d7 100644
--- a/KUBERNETES/Generic/Nodes.xml
+++ b/KUBERNETES/Generic/Nodes.xml
@@ -26,7 +26,15 @@
   </information>
   <variables frozen="0">
     <variable displayName="object_id" name="params.object_id" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="0" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="node" name="params.node" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Node" name="params.node" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="OS Image" name="params.osImage" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Kernel Version" name="params.kernelVersion" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="3" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Container Runtime Version" name="params.containerRuntimeVersion" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Kubelet Version" name="params.kubeletVersion" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="5" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="CPU" name="params.cpu" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Ephemeral Storage" name="params.ephemeralStorage" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="7" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Memory" name="params.memory" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="8" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Pods" name="params.pods" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="9" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
   </variables>
   <example/>
   <command name="IMPORT">
@@ -42,14 +50,54 @@
           <regexp>@&lt;name&gt;(?&lt;node&gt;.*)&lt;/name&gt;@</regexp>
           <xpath>//row/metadata/name</xpath>
         </line>
+        <line>
+          <array/>
+          <regexp>@&lt;osImage&gt;(?&lt;osImage&gt;.*)&lt;/osImage&gt;@</regexp>
+          <xpath>//row/status/nodeInfo/osImage</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;kernelVersion&gt;(?&lt;kernelVersion&gt;.*)&lt;/kernelVersion&gt;@</regexp>
+          <xpath>//row/status/nodeInfo/kernelVersion</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;containerRuntimeVersion&gt;(?&lt;containerRuntimeVersion&gt;.*)&lt;/containerRuntimeVersion&gt;@</regexp>
+          <xpath>//row/status/nodeInfo/containerRuntimeVersion</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;kubeletVersion&gt;(?&lt;kubeletVersion&gt;.*)&lt;/kubeletVersion&gt;@</regexp>
+          <xpath>//row/status/nodeInfo/kubeletVersion</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;cpu&gt;(?&lt;cpu&gt;.*)&lt;/cpu&gt;@</regexp>
+          <xpath>//row/status/capacity/cpu</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;ephemeral-storage&gt;(?&lt;ephemeralStorage&gt;.*)&lt;/ephemeral-storage&gt;@</regexp>
+          <xpath>//row/status/capacity/ephemeral-storage</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;memory&gt;(?&lt;memory&gt;.*)&lt;/memory&gt;@</regexp>
+          <xpath>//row/status/capacity/memory</xpath>
+        </line>
+        <line>
+          <array/>
+          <regexp>@&lt;pods&gt;(?&lt;pods&gt;.*)&lt;/pods&gt;@</regexp>
+          <xpath>//row/status/capacity/pods</xpath>
+        </line>
       </lines>
     </parser>
     <xpath>/api/v1/nodes/</xpath>
   </command>
-  <command name="CREATE"/>
-  <command name="READ"/>
   <command name="UPDATE"/>
   <command name="CONSTRAINT"/>
+  <command name="CREATE"/>
   <command name="DELETE"/>
+  <command name="READ"/>
   <command name="LIST"/>
 </ObjectDefinition>
diff --git a/KUBERNETES/Generic/k8_pods_list.xml b/KUBERNETES/Generic/k8_pods_list.xml
index 6c200831..cc8624f3 100755
--- a/KUBERNETES/Generic/k8_pods_list.xml
+++ b/KUBERNETES/Generic/k8_pods_list.xml
@@ -5,7 +5,7 @@
     <displayField>object_id</displayField>
     <serviceTaskType/>
     <order>10000</order>
-    <visibility>0</visibility>
+    <visibility>5</visibility>
     <configType>xml</configType>
     <createTemplateId/>
     <createTemplateObject/>
@@ -26,41 +26,41 @@
   </information>
   <variables frozen="0">
     <variable displayName="Name" name="params.object_id" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="0" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="Creation Date" name="params.creation_date" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
+    <variable displayName="Namespace" name="params.namespace" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Container Name" name="params.container_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
       <sections>
         <sections>Pods</sections>
       </sections>
     </variable>
-    <variable displayName="App Name" name="params.app_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
+    <variable displayName="Creation Date" name="params.creation_date" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
       <sections>
         <sections>Pods</sections>
       </sections>
-      <values>
-        <values displayValue="nginx">nginx</values>
-        <values displayValue="alpine">alpine</values>
-        <values displayValue="haproxy">haproxy</values>
-        <values displayValue="httpd">httpd</values>
-        <values displayValue="hello-world">hello-world</values>
-        <values displayValue="bash">bash</values>
-        <values displayValue="php">php</values>
-      </values>
     </variable>
     <variable displayName="Container Image" name="params.container_image" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="3" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
       <sections>
         <sections>Pods</sections>
       </sections>
     </variable>
-    <variable displayName="Container Name" name="params.container_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
+    <variable displayName="Container Status" name="params.container_status_phase" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
       <sections>
         <sections>Pods</sections>
       </sections>
     </variable>
-    <variable displayName="Container Status" name="params.container_status_phase" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
+    <variable displayName="App Name" name="params.app_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
       <sections>
         <sections>Pods</sections>
       </sections>
+      <values>
+        <values displayValue="nginx">nginx</values>
+        <values displayValue="alpine">alpine</values>
+        <values displayValue="haproxy">haproxy</values>
+        <values displayValue="httpd">httpd</values>
+        <values displayValue="hello-world">hello-world</values>
+        <values displayValue="bash">bash</values>
+        <values displayValue="php">php</values>
+      </values>
     </variable>
-    <variable displayName="Namespace" name="params.namespace" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
   </variables>
   <example>
     <content></content>