diff --git a/.gitignore b/.gitignore
index 45f23d21d..ddb59ac94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,8 @@ containers/ssh/*
 !containers/ssh/example_config
 
 !okitweb/static/model
+/docker-compose.yml
+/containers/runtime/
+/node/
+/node/node_modules
+/node/package-lock.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8bd10334..65b8dd6a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Release Notes
 
+
+## Version 0.17.0
+**Release Date**: 10th February 2021
+### Features
+1. Simple Tabular view added to display the required properties for resources in a table format (OKIT-124).
+2. Allow Subnets to be place in compartments that do not contain the associated Virtual Cloud Network (OKIT-128).
+3. Update Copyright
+
+### Bug Fixes
+1. Compartment name is now displayed correctly for queried compartment.
+
+
 ## Version 0.16.0
 **Release Date**: 20th January 2021
 ### Features
diff --git a/Dockerfile b/Dockerfile
index 4253204f0..5d887a872 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.16.0" \
+      "version"="0.17.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
@@ -41,6 +41,7 @@ RUN yum install -y \
  && python3 -m pip install --upgrade pip \
 # Install required python modules
  && pip3 install --no-cache-dir \
+        authlib==0.15.3 \
         flask==1.1.1 \
         gitpython==3.1.11 \
         git-url-parse==1.2.2 \
diff --git a/README.md b/README.md
index fc4cd2c32..da25ac8b4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.16.0](CHANGELOG.md#version-0.16.0)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.17.0](CHANGELOG.md#version-0.17.0)
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
 [deploy](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit) and visualise ([introspect/query](https://www.ateam-oracle.com/the-oci-designer-toolkit-query-feature)) 
diff --git a/containers/cloud/cloud_init.yml b/containers/cloud/cloud_init.yml
index 36456a088..7273ae89e 100644
--- a/containers/cloud/cloud_init.yml
+++ b/containers/cloud/cloud_init.yml
@@ -12,7 +12,7 @@ runcmd:
   # Install Required Packages because the packages section may not complete before the runcmd
   - sudo bash -c "yum install -y git python-oci-cli oci-utils"
   # Install Required Python Modules
-  - sudo bash -c "pip3 install --no-cache-dir flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6"
+  - sudo bash -c "pip3 install --no-cache-dir authlib==0.15.3 flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6"
   # Clone OKIT
   - sudo bash -c "git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit"
   - sudo bash -c "mkdir /okit/{log,workspace}"
diff --git a/containers/cloud/okit-ws.json b/containers/cloud/okit-ws.json
index 7e178257d..3c9f426a1 100644
--- a/containers/cloud/okit-ws.json
+++ b/containers/cloud/okit-ws.json
@@ -51,7 +51,7 @@
       },
       "metadata": {
         "ssh_authorized_keys": "",
-        "user_data": "#cloud-config\nwrite_files:\n  # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)\n  - path: /etc/.bashrc\n    append: true\n    content: |\n      alias lh='ls -lash'\n      alias lt='ls -last'\n      alias env='/usr/bin/env | sort'\n\nruncmd:\n  # Install Required Packages because the packages section may not complete before the runcmd\n  - sudo bash -c \"yum install -y git python-oci-cli oci-utils\"\n  # Install Required Python Modules\n  - sudo bash -c \"pip3 install --no-cache-dir flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6\"\n  # Clone OKIT\n  - sudo bash -c \"git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit\"\n  - sudo bash -c \"mkdir /okit/{log,workspace}\"\n  # Add additional environment information because append does not appear to work in write_file\n  - sudo bash -c \"echo 'source /etc/.bashrc' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OCI_CLI_AUTH=instance_principal' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OKIT_VM_COMPARTMENT=`oci-metadata -g \"compartmentID\" --value-only`' >> /etc/bashrc\"\n  # Copy GUnicorn Service File\n  - sudo bash -c 'sed \"s/{COMPARTMENT_OCID}/`oci-metadata -g compartmentID --value-only`/\" /okit/containers/services/gunicorn.service > /etc/systemd/system/gunicorn.service'\n  # Enable Gunicorn Service\n  - sudo systemctl enable gunicorn.service\n  - sudo systemctl start gunicorn.service\n\nfinal_message: \"**** The system is finally up, after $UPTIME seconds ****\"\n"
+        "user_data": "#cloud-config\nwrite_files:\n  # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)\n  - path: /etc/.bashrc\n    append: true\n    content: |\n      alias lh='ls -lash'\n      alias lt='ls -last'\n      alias env='/usr/bin/env | sort'\n\nruncmd:\n  # Install Required Packages because the packages section may not complete before the runcmd\n  - sudo bash -c \"yum install -y git python-oci-cli oci-utils\"\n  # Install Required Python Modules\n  - sudo bash -c \"pip3 install --no-cache-dir authlib==0.15.3 flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6\"\n  # Clone OKIT\n  - sudo bash -c \"git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit\"\n  - sudo bash -c \"mkdir /okit/{log,workspace}\"\n  # Add additional environment information because append does not appear to work in write_file\n  - sudo bash -c \"echo 'source /etc/.bashrc' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OCI_CLI_AUTH=instance_principal' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OKIT_VM_COMPARTMENT=`oci-metadata -g \"compartmentID\" --value-only`' >> /etc/bashrc\"\n  # Copy GUnicorn Service File\n  - sudo bash -c 'sed \"s/{COMPARTMENT_OCID}/`oci-metadata -g compartmentID --value-only`/\" /okit/containers/services/gunicorn.service > /etc/systemd/system/gunicorn.service'\n  # Enable Gunicorn Service\n  - sudo systemctl enable gunicorn.service\n  - sudo systemctl start gunicorn.service\n\nfinal_message: \"**** The system is finally up, after $UPTIME seconds ****\"\n"
       },
       "block_storage_volume_ids": [],
       "object_storage_bucket_ids": [],
diff --git a/containers/docker/8-slim/Dockerfile b/containers/docker/8-slim/Dockerfile
index f6208a349..49892ba09 100644
--- a/containers/docker/8-slim/Dockerfile
+++ b/containers/docker/8-slim/Dockerfile
@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:8-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.16.0" \
+      "version"="0.17.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
diff --git a/containers/docker/8-slim/docker-compose.yml b/containers/docker/8-slim/docker-compose.yml
index ccbea0ebe..ae46f22aa 100644
--- a/containers/docker/8-slim/docker-compose.yml
+++ b/containers/docker/8-slim/docker-compose.yml
@@ -1,6 +1,6 @@
 ---
 # file: docker-compose
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 version: '3.1'
 services:
diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index 87f5fd2c5..1696cc91d 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.16.0" \
+      "version"="0.17.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
@@ -33,7 +33,6 @@ RUN yum install -y \
         git \
         python36 \
         python3-pip \
-        git \
 #        python36-pyyaml \
 #        python36-oci-sdk \
 #        rh-nginx114 \
@@ -42,6 +41,7 @@ RUN yum install -y \
  && python3 -m pip install --upgrade pip \
 # Install required python modules
  && pip3 install --no-cache-dir \
+        authlib==0.15.3 \
         flask==1.1.1 \
         gitpython==3.1.11 \
         git-url-parse==1.2.2 \
diff --git a/containers/docker/docker-compose.yml b/containers/docker/docker-compose.yml
index 420c99f51..9f2cff5f8 100644
--- a/containers/docker/docker-compose.yml
+++ b/containers/docker/docker-compose.yml
@@ -1,6 +1,6 @@
 ---
 # file: docker-compose
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 version: '3.1'
 services:
diff --git a/containers/docker/nginx.conf b/containers/docker/nginx.conf
index 9762178cc..d1f24dbdb 100644
--- a/containers/docker/nginx.conf
+++ b/containers/docker/nginx.conf
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # For more information on configuration, see:
diff --git a/containers/docker/okit_nginx.conf b/containers/docker/okit_nginx.conf
index b84f7e940..bdc88fb09 100644
--- a/containers/docker/okit_nginx.conf
+++ b/containers/docker/okit_nginx.conf
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 server {
diff --git a/containers/docker/run-server.sh b/containers/docker/run-server.sh
index b35f2d301..d7d6a57d7 100755
--- a/containers/docker/run-server.sh
+++ b/containers/docker/run-server.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo "*******************************************************************"
diff --git a/containers/scripts/build-docker-image.sh b/containers/scripts/build-docker-image.sh
index 4e2f76a57..0684de6f9 100755
--- a/containers/scripts/build-docker-image.sh
+++ b/containers/scripts/build-docker-image.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export ROOT_DIR=$(cd $(dirname $0)/../..; pwd)
diff --git a/containers/scripts/start-okit-server.sh b/containers/scripts/start-okit-server.sh
index ae24ac8fc..50b5dd783 100755
--- a/containers/scripts/start-okit-server.sh
+++ b/containers/scripts/start-okit-server.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export ROOT_DIR=$(cd $(dirname $0)/../..; pwd)
diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile
index e54ce081c..33c47d0db 100644
--- a/containers/vagrant/Vagrantfile
+++ b/containers/vagrant/Vagrantfile
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Vagrantfile API/syntax version.
diff --git a/containers/vagrant/configure_firewall.sh b/containers/vagrant/configure_firewall.sh
index e1d955108..9534be752 100644
--- a/containers/vagrant/configure_firewall.sh
+++ b/containers/vagrant/configure_firewall.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 
diff --git a/containers/vagrant/configure_software.sh b/containers/vagrant/configure_software.sh
index 81172731a..e2e3bd29f 100644
--- a/containers/vagrant/configure_software.sh
+++ b/containers/vagrant/configure_software.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export PATH=/usr/local/bin:/usr/bin:${PATH}
@@ -38,13 +38,16 @@ python3 -m pip install --upgrade pip==20.0.2
 
 # Install required python modules
 pip3 install --no-cache-dir \
-      flask==1.1.1 \
-      gitpython==3.1.11 \
-      gunicorn==20.0.4 \
-      oci==2.22.0 \
-      pandas==1.1.2 \
-      python-magic==0.4.18 \
-      pyyaml==5.3.1 \
-      requests==2.24.0 \
-      xlsxwriter==1.3.6
+        authlib==0.15.3 \
+        flask==1.1.1 \
+        gitpython==3.1.11 \
+        git-url-parse==1.2.2 \
+        gunicorn==20.0.4 \
+        oci==2.22.0 \
+        openpyxl==3.0.5 \
+        pandas==1.1.2 \
+        python-magic==0.4.18 \
+        pyyaml==5.3.1 \
+        requests==2.24.0 \
+        xlsxwriter==1.3.6
 
diff --git a/containers/vagrant/enable_flask_service.sh b/containers/vagrant/enable_flask_service.sh
index 3f76ce3a4..e7f3b952d 100644
--- a/containers/vagrant/enable_flask_service.sh
+++ b/containers/vagrant/enable_flask_service.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc
diff --git a/containers/vagrant/enable_gunicorn_service.sh b/containers/vagrant/enable_gunicorn_service.sh
index 7fe30faf7..2940e5d6e 100644
--- a/containers/vagrant/enable_gunicorn_service.sh
+++ b/containers/vagrant/enable_gunicorn_service.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc
diff --git a/containers/vagrant/enable_nginx_service.sh b/containers/vagrant/enable_nginx_service.sh
index 797c5294e..6ce54260b 100644
--- a/containers/vagrant/enable_nginx_service.sh
+++ b/containers/vagrant/enable_nginx_service.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc
diff --git a/containers/vagrant/nginx.conf b/containers/vagrant/nginx.conf
index 62ee56ed9..76c09b701 100644
--- a/containers/vagrant/nginx.conf
+++ b/containers/vagrant/nginx.conf
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # For more information on configuration, see:
diff --git a/documentation/Development.md b/documentation/Development.md
index 224cf7a7b..251bcab1d 100644
--- a/documentation/Development.md
+++ b/documentation/Development.md
@@ -68,7 +68,7 @@ INFO: Writing File: ../visualiser/facade/ociBlockStorageVolume.py
 Following generation a model file will be created in the **okitweb/static/okit/model/js/artefacts** directory as shown below.
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
@@ -160,7 +160,7 @@ any reference to it on delete. This is done by adding the deleteChildren() funct
 Following the update the model JavaScript will be modified as below:
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
@@ -259,7 +259,7 @@ OkitJson.prototype.deleteBlockStorageVolume = function(id) {
 Following generation a view file will be created in the **okitweb/static/okit/view/js/artefacts** directory as shown below.
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume View Javascript');
@@ -367,7 +367,7 @@ Instance it is attached to) by creating the following functions:
 Following the update the model JavaScript will be modified as below:
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume View Javascript');
@@ -512,7 +512,7 @@ Following the update the model JavaScript will be modified as below:
 Following generation a property sheet HTML file will be created in the **okitweb/templates/okit/propertysheets** directory as shown below.
 ```jinja2
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -532,7 +532,7 @@ worked example we will need add the following fields:
 
 ```jinja2
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -566,7 +566,7 @@ Following generation a Python Facade file will be created in the **visualiser/fa
 ```python
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -628,7 +628,7 @@ to the correct name **self.client.list_volumes** which will result in the follow
 ```python
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -1009,5 +1009,5 @@ docker run -it --rm -p 80:80 --name okit --hostname okit \
     -v ${OKIT_GITHUB}/skeletons:/okit/skeletons \
     -v ${OKIT_GITHUB}/visualiser:/okit/visualiser \
     -v ${OKIT_WORKSPACE}/log:/okit/log \
-    -v ${OKIT_WORKSPACE}/dropdown.json:/okit/okitweb/static/okit/json/dropdown.json  okit'
+    okit
 ```
diff --git a/okitweb/__init__.py b/okitweb/__init__.py
index a2799443b..04af4fa44 100644
--- a/okitweb/__init__.py
+++ b/okitweb/__init__.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/okitweb/okitImport.py b/okitweb/okitImport.py
index 437a62cf8..03b166f23 100644
--- a/okitweb/okitImport.py
+++ b/okitweb/okitImport.py
@@ -20,7 +20,7 @@
 from common.okitLogging import getLogger
 from parsers.okitHclJsonParser import OkitHclJsonParser
 from parsers.okitCceJsonParser import OkitCceJsonParser
-from parsers.OkitCd3ExcelParser import OkitCd3ExcelParser
+from parsers.okitCd3ExcelParser import OkitCd3ExcelParser
 
 # Configure logging
 logger = getLogger()
diff --git a/okitweb/okitOci.py b/okitweb/okitOci.py
index 8071ac505..8765c6445 100644
--- a/okitweb/okitOci.py
+++ b/okitweb/okitOci.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/okitweb/okitPricing.py b/okitweb/okitPricing.py
index 45af36819..78d839293 100644
--- a/okitweb/okitPricing.py
+++ b/okitweb/okitPricing.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/okitweb/okitWebDesigner.py b/okitweb/okitWebDesigner.py
index b279ad105..9ef1c1c66 100644
--- a/okitweb/okitWebDesigner.py
+++ b/okitweb/okitWebDesigner.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/okitweb/static/okit/css/okit_console.css b/okitweb/static/okit/css/okit_console.css
index 434627319..26cb4b511 100644
--- a/okitweb/static/okit/css/okit_console.css
+++ b/okitweb/static/okit/css/okit_console.css
@@ -1,5 +1,5 @@
 /*
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 
@@ -607,6 +607,13 @@ li a.parent-item:hover {
     text-align: center;
 }
 
+.okit-tbody-alternating-colours > .tr:nth-child(odd) {
+}
+
+.okit-tbody-alternating-colours > .tr:nth-child(even) {
+    background-color: lightsteelblue;
+}
+
 .okit-properties-table {
 }
 
diff --git a/okitweb/static/okit/css/okit_designer.css b/okitweb/static/okit/css/okit_designer.css
index 993b61756..f445fdbbe 100644
--- a/okitweb/static/okit/css/okit_designer.css
+++ b/okitweb/static/okit/css/okit_designer.css
@@ -1,5 +1,5 @@
 /*
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 
@@ -158,6 +158,16 @@
     color: #aeaeae;
 }
 
+.okit-tab-contents {
+    display: block;
+    width: 100%;
+    margin: 2px;
+    overflow-x: auto;
+    white-space: nowrap;
+    flex-wrap: nowrap;
+    scrollbar-width: none; /* Firefox */
+}
+
 .okit-tab:hover {
     color: black !important;
 }
@@ -198,6 +208,14 @@
     width: 87%;
 }
 
+.okit-tabular-canvas {
+    display: block;
+    padding: 0;
+    margin: 0;
+    height: 100%;
+    width: 100%;
+    overflow: scroll;
+}
 .okit-svg-canvas {
     display: block;
     padding: 0;
diff --git a/okitweb/static/okit/js/okit.js b/okitweb/static/okit/js/okit.js
index 2b134e12d..ae2520be8 100644
--- a/okitweb/static/okit/js/okit.js
+++ b/okitweb/static/okit/js/okit.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Javascript');
@@ -113,6 +113,14 @@ class OkitOCIData {
     getCpeDeviceShapes() {
         return this.cpe_device_shapes;
     }
+    getCpeDeviceShape(id) {
+        for (let shape of this.getCpeDeviceShapes()) {
+            if (shape.id === id) {
+                shape.display_name = `${shape.cpe_device_info.vendor} ${shape.cpe_device_info.platform_software_version}`;
+                return shape;
+            }
+        }
+    }
 
     getDBSystemShapes(family='') {
         if (family === '') {
@@ -189,6 +197,13 @@ class OkitOCIData {
             return this.mysql_configurations.filter(function(dss) {return dss.shape_name === shape_name;});
         }
     }
+    getMySQLConfiguration(id) {
+        for (let shape of this.getMySQLConfigurations()) {
+            if (shape.id === id) {
+                return shape;
+            }
+        }
+    }
 
     getMySQLShapes() {
         return this.mysql_shapes;
@@ -231,6 +246,7 @@ class OkitSettings {
         this.name_prefix = 'okit-';
         this.auto_save = false;
         this.show_ocids = false;
+        this.validate_markdown = true;
         this.load();
     }
 
@@ -316,6 +332,8 @@ class OkitSettings {
             this.addHighlightAssociations(tbody, autosave);
             // Display OCIDs
             this.addShowOcids(tbody, autosave);
+            // Validate Before Markdowns
+            this.addValidateMarkdown(tbody, autosave);
             // Display Label
             this.addDisplayLabel(tbody, autosave);
             // Tooltip Style
@@ -546,6 +564,27 @@ class OkitSettings {
             .text('Display OCIDs');
     }
 
+    addValidateMarkdown(tbody, autosave) {
+        let self = this;
+        let tr = tbody.append('div').attr('class', 'tr');
+        tr.append('div').attr('class', 'td').text('');
+        let td = tr.append('div').attr('class', 'td');
+        td.append('input')
+            .attr('id', 'validate_markdown')
+            .attr('name', 'validate_markdown')
+            .attr('type', 'checkbox')
+            .property('checked', this.validate_markdown)
+            .on('change', function () {
+                if (autosave) {
+                    self.validate_markdown = $('#validate_markdown').is(':checked');
+                    self.save();
+                }
+            });
+        td.append('label')
+            .attr('for', 'validate_markdown')
+            .text('Validate Before Markdown');
+    }
+
     addDisplayLabel(tbody, autosave) {
         // Display Label
         let self = this;
diff --git a/okitweb/static/okit/js/okit_common.js b/okitweb/static/okit/js/okit_common.js
index 99f6214dc..35d194147 100644
--- a/okitweb/static/okit/js/okit_common.js
+++ b/okitweb/static/okit/js/okit_common.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Common Javascript');
diff --git a/okitweb/static/okit/js/okit_console.js b/okitweb/static/okit/js/okit_console.js
index cc630fa54..fa401df99 100644
--- a/okitweb/static/okit/js/okit_console.js
+++ b/okitweb/static/okit/js/okit_console.js
@@ -1,11 +1,11 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Console Javascript');
 
-const okitVersion = '0.16.0';
-const okitReleaseDate = '20th January 2021';
+const okitVersion = '0.17.0';
+const okitReleaseDate = '10th February 2021';
 // Validation
 const validate_error_colour = "#ff4d4d";
 const validate_warning_colour = "#ffd633";
diff --git a/okitweb/static/okit/js/okit_designer.js b/okitweb/static/okit/js/okit_designer.js
index 87d6e2133..1c6a8a501 100644
--- a/okitweb/static/okit/js/okit_designer.js
+++ b/okitweb/static/okit/js/okit_designer.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Javascript');
@@ -33,6 +33,7 @@ let right_drag_bar_start_x = 0;
 let ociRegions = [];
 
 function resetDesigner() {
+    handleSwitchToCompartmentView();
     newModel();
     newDesignerView();
     regionOkitJson = {};
diff --git a/okitweb/static/okit/js/okit_designer_drag_drop.js b/okitweb/static/okit/js/okit_designer_drag_drop.js
index 1e032bc91..99e0a8260 100644
--- a/okitweb/static/okit/js/okit_designer_drag_drop.js
+++ b/okitweb/static/okit/js/okit_designer_drag_drop.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Drag & Drop Javascript');
diff --git a/okitweb/static/okit/js/okit_designer_generation.js b/okitweb/static/okit/js/okit_designer_generation.js
index b8bdffef6..678e44519 100644
--- a/okitweb/static/okit/js/okit_designer_generation.js
+++ b/okitweb/static/okit/js/okit_designer_generation.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Generation Javascript');
@@ -548,7 +548,7 @@ function handleExportToMarkdownGit(e) {
     okitJsonModel.validate(generateMarkdown);
 }
 function generateMarkdown(results) {
-    if (results.valid) {
+    if (results.valid || !okitSettings.validate_markdown) {
         let requestJson = JSON.clone(okitJsonModel);
         requestJson.use_variables = okitSettings.is_variables;
         setExportDisplay();
diff --git a/okitweb/static/okit/js/okit_designer_properties.js b/okitweb/static/okit/js/okit_designer_properties.js
index 9c37594be..4a8b3cc59 100644
--- a/okitweb/static/okit/js/okit_designer_properties.js
+++ b/okitweb/static/okit/js/okit_designer_properties.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Properties Javascript');
@@ -89,13 +89,13 @@ function loadPropertiesSheet(json_element) {
                     $(jqId(key)).find("input:checkbox").each(function() {
                         if ($(this).prop('checked')) {json_element[key].push($(this).val());}
                     });
-                    redrawSVGCanvas();
+                    redrawSVGCanvas(true);
                 });
                 if (val.includes($(this).val())) {$(this).prop("checked", true);}
             });
         } else if ($(jqId(key)).is("select")) {                        // Select
             console.info(key + ' is select with value ' + val);
-            $(jqId(key)).on('change', () => {json_element[key] = $(jqId(key)).val() ? $(jqId(key)).val() : ''; $(jqId(key)).removeClass('okit-warning'); redrawSVGCanvas();});
+            $(jqId(key)).on('change', () => {json_element[key] = $(jqId(key)).val() ? $(jqId(key)).val() : ''; $(jqId(key)).removeClass('okit-warning'); redrawSVGCanvas(true);});
             $(jqId(key)).val(val);
             if (!$(jqId(key)).val() && !Array.isArray(val) && String(val).trim() !== '') {
                 console.warn(`Value ${val} not in select list ${key}`);
diff --git a/okitweb/static/okit/js/okit_designer_ready.js b/okitweb/static/okit/js/okit_designer_ready.js
index 7fd9a61bd..1b3e6503a 100644
--- a/okitweb/static/okit/js/okit_designer_ready.js
+++ b/okitweb/static/okit/js/okit_designer_ready.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Ready Javascript');
@@ -7,12 +7,13 @@ console.info('Loaded Designer Ready Javascript');
 /*
 ** Define variables for Artefact classes
  */
-let okitJsonModel = new OkitJson();
+//let okitJsonModel = new OkitJson();
 let okitOciConfig = new OkitOCIConfig();
 let okitOciData = new OkitOCIData();
 let okitSettings = new OkitSettings();
 let okitGitConfig = new OkitGITConfig();
 let okitAutoSave = undefined;
+//let okitTabularView = new OkitTabularJsonView();
 /*
 ** Ready function initiated on page load.
  */
@@ -26,6 +27,7 @@ $(document).ready(function() {
     okitGitConfig = new OkitGITConfig();
     okitJsonModel = new OkitJson();
     okitJsonView = new OkitDesignerJsonView(okitJsonModel);
+    okitTabularView = new OkitTabularJsonView(okitJsonModel);
     console.info(okitJsonView);
     /*
     ** Configure Auto Save
@@ -101,7 +103,7 @@ $(document).ready(function() {
     // Right Bar & Panels
     // Description
     d3.select(d3Id('console_right_bar')).append('label')
-        .attr('id', 'toggle_properties_button')
+        .attr('id', 'toggle_description_button')
         .attr('class', 'okit-pointer-cursor')
         .on('click', function () {
             let open = $(this).hasClass('okit-bar-panel-displayed');
diff --git a/okitweb/static/okit/js/okit_designer_svg.js b/okitweb/static/okit/js/okit_designer_svg.js
index 39f023c16..0ef314732 100644
--- a/okitweb/static/okit/js/okit_designer_svg.js
+++ b/okitweb/static/okit/js/okit_designer_svg.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded SVG Javascript');
diff --git a/okitweb/static/okit/js/okit_import.js b/okitweb/static/okit/js/okit_import.js
index 64c9729ce..8ab48c37b 100644
--- a/okitweb/static/okit/js/okit_import.js
+++ b/okitweb/static/okit/js/okit_import.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Import Javascript');
diff --git a/okitweb/static/okit/js/okit_mode.js b/okitweb/static/okit/js/okit_mode.js
index e216c95cf..5a051310b 100644
--- a/okitweb/static/okit/js/okit_mode.js
+++ b/okitweb/static/okit/js/okit_mode.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Mode Javascript');
diff --git a/okitweb/static/okit/js/okit_view_layout.js b/okitweb/static/okit/js/okit_view_layout.js
new file mode 100644
index 000000000..4caf91aba
--- /dev/null
+++ b/okitweb/static/okit/js/okit_view_layout.js
@@ -0,0 +1,34 @@
+/*
+** Copyright (c) 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded View Layout Javascript');
+
+function hideAllViewDivs() {
+    $("#canvas-div").addClass('hidden');
+    $("#tabular-div").addClass('hidden');
+    $("#network-div").addClass('hidden');
+    $("#security-div").addClass('hidden');
+}
+
+function handleSwitchToCompartmentView(e) {
+    hideAllViewDivs();
+    $("#canvas-div").removeClass('hidden');
+}
+
+function handleSwitchToTabularView(e) {
+    hideAllViewDivs();
+    $("#tabular-div").removeClass('hidden');
+    okitTabularView = new OkitTabularJsonView(okitJsonModel, okitOciData);
+    okitTabularView.draw();
+}
+
+function handleSwitchToNetworkView(e) {
+    hideAllViewDivs();
+    $("#network-div").removeClass('hidden');
+}
+
+function handleSwitchToSecurityView(e) {
+    hideAllViewDivs();
+    $("#security-div").removeClass('hidden');
+}
diff --git a/okitweb/static/okit/json/dropdown.json b/okitweb/static/okit/json/dropdown.json
index 611035f96..6a432ec5a 100644
--- a/okitweb/static/okit/json/dropdown.json
+++ b/okitweb/static/okit/json/dropdown.json
@@ -147,9 +147,9 @@
     {
       "available_core_count": 48,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 74,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 720,
       "core_count_increment": 2,
       "maximum_node_count": 2,
       "min_core_count_per_node": 0,
@@ -165,9 +165,9 @@
     {
       "available_core_count": 336,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 336,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 5760,
       "core_count_increment": 8,
       "maximum_node_count": 8,
       "min_core_count_per_node": 44,
@@ -183,9 +183,9 @@
     {
       "available_core_count": 368,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 424,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 5760,
       "core_count_increment": 8,
       "maximum_node_count": 8,
       "min_core_count_per_node": 0,
@@ -201,9 +201,9 @@
     {
       "available_core_count": 400,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 598,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 5760,
       "core_count_increment": 8,
       "maximum_node_count": 8,
       "min_core_count_per_node": 0,
@@ -219,9 +219,9 @@
     {
       "available_core_count": 168,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 168,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 2880,
       "core_count_increment": 4,
       "maximum_node_count": 4,
       "min_core_count_per_node": 22,
@@ -237,9 +237,9 @@
     {
       "available_core_count": 184,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 212,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 2880,
       "core_count_increment": 4,
       "maximum_node_count": 4,
       "min_core_count_per_node": 0,
@@ -255,9 +255,9 @@
     {
       "available_core_count": 200,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 299,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 2880,
       "core_count_increment": 4,
       "maximum_node_count": 4,
       "min_core_count_per_node": 0,
@@ -273,9 +273,9 @@
     {
       "available_core_count": 84,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 84,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 1440,
       "core_count_increment": 2,
       "maximum_node_count": 2,
       "min_core_count_per_node": 11,
@@ -291,9 +291,9 @@
     {
       "available_core_count": 92,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 106,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 1440,
       "core_count_increment": 2,
       "maximum_node_count": 2,
       "min_core_count_per_node": 0,
@@ -309,9 +309,9 @@
     {
       "available_core_count": 100,
       "available_core_count_per_node": null,
-      "available_data_storage_in_t_bs": null,
+      "available_data_storage_in_t_bs": 149,
       "available_db_node_storage_in_g_bs": null,
-      "available_memory_in_gbs": null,
+      "available_memory_in_gbs": 1440,
       "core_count_increment": 2,
       "maximum_node_count": 2,
       "min_core_count_per_node": 0,
@@ -1211,6 +1211,40 @@
     }
   ],
   "images": [
+    {
+      "agent_features": null,
+      "base_image_id": null,
+      "compartment_id": null,
+      "create_image_allowed": true,
+      "defined_tags": {},
+      "display_name": "Canonical-Ubuntu-16.04-Gen2-GPU-2021.01.26-0",
+      "freeform_tags": {},
+      "id": "ocid1.image.oc1.phx.aaaaaaaamnjllb6qtmqo25knnwqhdgu2powizexveh3w5dp5lyifvftihl7q",
+      "launch_mode": "NATIVE",
+      "launch_options": {
+        "boot_volume_type": "PARAVIRTUALIZED",
+        "firmware": "UEFI_64",
+        "is_consistent_volume_naming_enabled": true,
+        "is_pv_encryption_in_transit_enabled": true,
+        "network_type": "PARAVIRTUALIZED",
+        "remote_data_volume_type": "PARAVIRTUALIZED"
+      },
+      "lifecycle_state": "AVAILABLE",
+      "operating_system": "Canonical Ubuntu",
+      "operating_system_version": "16.04",
+      "shapes": [
+        "VM.GPU2.1",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "BM.GPU4.8",
+        "BM.GPU2.2",
+        "BM.GPU3.8"
+      ],
+      "size_in_mbs": 47694,
+      "sort_key": "Canonical Ubuntu 16.04",
+      "time_created": "2021-01-30T00:09:03.242000+00:00"
+    },
     {
       "agent_features": null,
       "base_image_id": null,
@@ -1285,9 +1319,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-16.04-Gen2-GPU-2020.10.17-0",
+      "display_name": "Canonical-Ubuntu-16.04-2021.01.25-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaakrpo525cbdlmxnb6fv4lzrvtuf5saiztg6ep457qff2uxuijpbva",
+      "id": "ocid1.image.oc1.phx.aaaaaaaahuntkbemfd76qqabj3onaaae37k7hmmuskimrzcvcfsmarz6jznq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -1301,17 +1335,55 @@
       "operating_system": "Canonical Ubuntu",
       "operating_system_version": "16.04",
       "shapes": [
+        "VM.DenseIO1.16",
+        "VM.DenseIO1.4",
+        "VM.DenseIO1.8",
+        "VM.DenseIO2.16",
+        "VM.DenseIO2.24",
+        "VM.DenseIO2.8",
         "VM.GPU2.1",
         "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
+        "VM.Standard.B1.1",
+        "VM.Standard.B1.16",
+        "VM.Standard.B1.2",
+        "VM.Standard.B1.4",
+        "VM.Standard.B1.8",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.1.Micro",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard.E3.Flex",
+        "VM.Standard1.1",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8",
+        "BM.Standard.E2.64",
+        "BM.Standard.E3.128",
         "BM.GPU4.8",
+        "BM.Standard1.36",
+        "BM.HighIO1.36",
+        "BM.DenseIO1.36",
+        "x5-2.36.512.nvme-6.4-Internal",
+        "BM.Standard.B1.44",
         "BM.GPU2.2",
-        "BM.GPU3.8"
+        "BM.HPC2.36",
+        "BM.Standard2.52",
+        "BM.GPU3.8",
+        "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
       "sort_key": "Canonical Ubuntu 16.04",
-      "time_created": "2020-10-17T06:10:47.756000+00:00"
+      "time_created": "2021-01-30T00:09:50.061000+00:00"
     },
     {
       "agent_features": null,
@@ -1463,9 +1535,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-16.04-2020.10.14-0",
+      "display_name": "Canonical-Ubuntu-16.04-Minimal-2021.01.19-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaylgfzjbb5bl7ugranvp6jk3d2niqwjs5dqu3ftesmihaqlp3fduq",
+      "id": "ocid1.image.oc1.phx.aaaaaaaaev2og2iedtda77mjqiklsnfhapwg4scbhfvdsk2n7xivynmoeipq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -1477,7 +1549,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "Canonical Ubuntu",
-      "operating_system_version": "16.04",
+      "operating_system_version": "16.04 Minimal",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -1526,8 +1598,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Canonical Ubuntu 16.04",
-      "time_created": "2020-10-17T01:10:16.621000+00:00"
+      "sort_key": "Canonical Ubuntu 16.04 Minimal",
+      "time_created": "2021-02-01T11:07:34.997000+00:00"
     },
     {
       "agent_features": null,
@@ -1679,9 +1751,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-16.04-Minimal-2020.10.14-0",
+      "display_name": "Canonical-Ubuntu-18.04-2021.01.25-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaulhs5moiigqei3xtkuzpel7irbte2iao2d6avilnx2sig2xqjvla",
+      "id": "ocid1.image.oc1.phx.aaaaaaaa3wktpwwvpwlf25nlssxbqxaa3k3gao2j2lph7nfft434pppvmvlq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -1693,7 +1765,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "Canonical Ubuntu",
-      "operating_system_version": "16.04 Minimal",
+      "operating_system_version": "18.04",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -1742,8 +1814,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Canonical Ubuntu 16.04 Minimal",
-      "time_created": "2020-10-17T01:09:59.474000+00:00"
+      "sort_key": "Canonical Ubuntu 18.04",
+      "time_created": "2021-02-01T07:30:36.017000+00:00"
     },
     {
       "agent_features": null,
@@ -1895,9 +1967,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-18.04-2020.10.16-0",
+      "display_name": "Canonical-Ubuntu-18.04-Minimal-2021.01.26-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaqpfr4ttra3tngnyr7blmpwvzuqa753mjxjltx2a65evrtp5wj3eq",
+      "id": "ocid1.image.oc1.phx.aaaaaaaay5azy4q7hzolsgfkuor3vv3popf33vpism7pzxdhlik7lzsvsq3a",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -1909,7 +1981,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "Canonical Ubuntu",
-      "operating_system_version": "18.04",
+      "operating_system_version": "18.04 Minimal",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -1958,8 +2030,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Canonical Ubuntu 18.04",
-      "time_created": "2020-10-17T02:21:19.931000+00:00"
+      "sort_key": "Canonical Ubuntu 18.04 Minimal",
+      "time_created": "2021-02-01T07:33:22.506000+00:00"
     },
     {
       "agent_features": null,
@@ -2111,9 +2183,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-18.04-Minimal-2020.10.15-0",
+      "display_name": "Canonical-Ubuntu-20.04-2021.01.25-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaosuvccvo2rcps2gdcsc26yt4z2d5qhbjrfrs3wst444y75pow2fa",
+      "id": "ocid1.image.oc1.phx.aaaaaaaavhykwhe4bhsoa25kv2sbjixy3a3kqud33wvfjnim7yuhbvwbb4gq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2125,7 +2197,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "Canonical Ubuntu",
-      "operating_system_version": "18.04 Minimal",
+      "operating_system_version": "20.04",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -2174,8 +2246,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Canonical Ubuntu 18.04 Minimal",
-      "time_created": "2020-10-17T02:44:05.737000+00:00"
+      "sort_key": "Canonical Ubuntu 20.04",
+      "time_created": "2021-01-30T00:06:56.770000+00:00"
     },
     {
       "agent_features": null,
@@ -2327,9 +2399,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-20.04-2020.10.14-0",
+      "display_name": "Canonical-Ubuntu-20.04-Minimal-2021.01.19-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaah454432fg7zf5h2ufqxvfhzqokkaufgf5znua36p4puwnog7akcq",
+      "id": "ocid1.image.oc1.phx.aaaaaaaacctmcjjajc7xawyz3uuot4ei7q2tqw4yipbh5okosppc5v3yxava",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2341,7 +2413,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "Canonical Ubuntu",
-      "operating_system_version": "20.04",
+      "operating_system_version": "20.04 Minimal",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -2390,8 +2462,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Canonical Ubuntu 20.04",
-      "time_created": "2020-10-17T03:32:47.380000+00:00"
+      "sort_key": "Canonical Ubuntu 20.04 Minimal",
+      "time_created": "2021-01-30T00:03:15.081000+00:00"
     },
     {
       "agent_features": null,
@@ -2543,9 +2615,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Canonical-Ubuntu-20.04-Minimal-2020.10.14-0",
+      "display_name": "CentOS-6.10-2020.11.30-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaky4luenz7yvuzz26zipiun6dzbkm7hkon7tppynpm2l6p32aen7a",
+      "id": "ocid1.image.oc1.phx.aaaaaaaagomxh6kz5w2qyowz4bovjwcplqwemlvx6xu67slgq4bd7d7sdnoq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2556,8 +2628,8 @@
         "remote_data_volume_type": "PARAVIRTUALIZED"
       },
       "lifecycle_state": "AVAILABLE",
-      "operating_system": "Canonical Ubuntu",
-      "operating_system_version": "20.04 Minimal",
+      "operating_system": "CentOS",
+      "operating_system_version": "6.10",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -2565,21 +2637,11 @@
         "VM.DenseIO2.16",
         "VM.DenseIO2.24",
         "VM.DenseIO2.8",
-        "VM.GPU2.1",
-        "VM.GPU3.1",
-        "VM.GPU3.2",
-        "VM.GPU3.4",
-        "VM.Standard.B1.1",
-        "VM.Standard.B1.16",
-        "VM.Standard.B1.2",
-        "VM.Standard.B1.4",
-        "VM.Standard.B1.8",
+        "VM.Standard.A1.Flex",
         "VM.Standard.E2.1",
-        "VM.Standard.E2.1.Micro",
         "VM.Standard.E2.2",
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
-        "VM.Standard.E3.Flex",
         "VM.Standard1.1",
         "VM.Standard1.16",
         "VM.Standard1.2",
@@ -2592,13 +2654,9 @@
         "VM.Standard2.4",
         "VM.Standard2.8",
         "BM.Standard.E2.64",
-        "BM.Standard.E3.128",
-        "BM.GPU4.8",
         "BM.Standard1.36",
         "BM.HighIO1.36",
         "BM.DenseIO1.36",
-        "x5-2.36.512.nvme-6.4-Internal",
-        "BM.Standard.B1.44",
         "BM.GPU2.2",
         "BM.HPC2.36",
         "BM.Standard2.52",
@@ -2606,8 +2664,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Canonical Ubuntu 20.04 Minimal",
-      "time_created": "2020-10-17T03:34:27.562000+00:00"
+      "sort_key": "CentOS 6.10",
+      "time_created": "2020-12-01T00:17:07.381000+00:00"
     },
     {
       "agent_features": null,
@@ -2615,9 +2673,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "CentOS-6.10-2020.11.30-0",
+      "display_name": "CentOS-6.10-2020.10.21-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaagomxh6kz5w2qyowz4bovjwcplqwemlvx6xu67slgq4bd7d7sdnoq",
+      "id": "ocid1.image.oc1.phx.aaaaaaaabahzlltad2dwfgwbvyp2xju4efyuydq23gg3uifakab7umpyyjba",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2637,7 +2695,6 @@
         "VM.DenseIO2.16",
         "VM.DenseIO2.24",
         "VM.DenseIO2.8",
-        "VM.Standard.A1.Flex",
         "VM.Standard.E2.1",
         "VM.Standard.E2.2",
         "VM.Standard.E2.4",
@@ -2665,7 +2722,7 @@
       ],
       "size_in_mbs": 47694,
       "sort_key": "CentOS 6.10",
-      "time_created": "2020-12-01T00:17:07.381000+00:00"
+      "time_created": "2020-10-27T18:29:41.501000+00:00"
     },
     {
       "agent_features": null,
@@ -2673,9 +2730,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "CentOS-6.10-2020.10.21-0",
+      "display_name": "CentOS-6.10-2020.09.21-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaabahzlltad2dwfgwbvyp2xju4efyuydq23gg3uifakab7umpyyjba",
+      "id": "ocid1.image.oc1.phx.aaaaaaaa4krne6bs2onsnjbyo7vo2fa2wt4cp4jpra2fjbprumpmcjuhqwuq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2722,7 +2779,7 @@
       ],
       "size_in_mbs": 47694,
       "sort_key": "CentOS 6.10",
-      "time_created": "2020-10-27T18:29:41.501000+00:00"
+      "time_created": "2020-09-30T05:14:13.700000+00:00"
     },
     {
       "agent_features": null,
@@ -2730,9 +2787,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "CentOS-6.10-2020.09.21-0",
+      "display_name": "CentOS-7-2021.01.14-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaa4krne6bs2onsnjbyo7vo2fa2wt4cp4jpra2fjbprumpmcjuhqwuq",
+      "id": "ocid1.image.oc1.phx.aaaaaaaa4asphkm3spt4uuawwovhktrb4x6minpoer3gt6kjwvfre2vi6ohq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2744,7 +2801,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "CentOS",
-      "operating_system_version": "6.10",
+      "operating_system_version": "7",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -2752,10 +2809,17 @@
         "VM.DenseIO2.16",
         "VM.DenseIO2.24",
         "VM.DenseIO2.8",
+        "VM.GPU2.1",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
         "VM.Standard.E2.1",
+        "VM.Standard.E2.1.Micro",
         "VM.Standard.E2.2",
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
+        "VM.Standard.E3.Flex",
+        "VM.Standard.E4.Flex",
         "VM.Standard1.1",
         "VM.Standard1.16",
         "VM.Standard1.2",
@@ -2768,6 +2832,8 @@
         "VM.Standard2.4",
         "VM.Standard2.8",
         "BM.Standard.E2.64",
+        "BM.Standard.E3.128",
+        "BM.GPU4.8",
         "BM.Standard1.36",
         "BM.HighIO1.36",
         "BM.DenseIO1.36",
@@ -2778,8 +2844,8 @@
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "CentOS 6.10",
-      "time_created": "2020-09-30T05:14:13.700000+00:00"
+      "sort_key": "CentOS 7",
+      "time_created": "2021-01-15T17:50:02.815000+00:00"
     },
     {
       "agent_features": null,
@@ -2840,6 +2906,7 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
+        "BM.DenseIO2.52",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
@@ -2918,9 +2985,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "CentOS-7-2020.10.21-0",
+      "display_name": "CentOS-8-2021.01.14-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaafaixos2vp4v3mukoqsxmmof52gpbh63yvnegg27g5osoyy77auqa",
+      "id": "ocid1.image.oc1.phx.aaaaaaaa2o6pedsahmakjfcrzy3yyh2ju4zuuusxzgwdnr7pozqeqb6fp3jq",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -2932,7 +2999,7 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "CentOS",
-      "operating_system_version": "7",
+      "operating_system_version": "8",
       "shapes": [
         "VM.DenseIO1.16",
         "VM.DenseIO1.4",
@@ -2950,6 +3017,7 @@
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
         "VM.Standard.E3.Flex",
+        "VM.Standard.E4.Flex",
         "VM.Standard1.1",
         "VM.Standard1.16",
         "VM.Standard1.2",
@@ -2971,11 +3039,15 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
+        "BM.DenseIO2.52",
+        "BM.HPC2.36",
+        "BM.Standard2.52",
+        "BM.GPU3.8",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "CentOS 7",
-      "time_created": "2020-10-27T18:33:00.631000+00:00"
+      "sort_key": "CentOS 8",
+      "time_created": "2021-01-15T17:52:15.583000+00:00"
     },
     {
       "agent_features": null,
@@ -3090,6 +3162,7 @@
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
         "VM.Standard.E3.Flex",
+        "VM.Standard.E4.Flex",
         "VM.Standard1.1",
         "VM.Standard1.16",
         "VM.Standard1.2",
@@ -3181,6 +3254,7 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
+        "BM.DenseIO2.52",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
@@ -3459,6 +3533,9 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
+        "BM.DenseIO2.52",
+        "BM.Standard2.52",
+        "BM.GPU3.8",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
@@ -3529,8 +3606,8 @@
         "BM.Standard2.52",
         "BM.GPU3.8",
         "BM.DenseIO2.52",
-        "BM.Standard2.52",
         "BM.GPU3.8",
+        "BM.DenseIO2.52",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
@@ -3737,6 +3814,7 @@
         "VM.Standard2.8",
         "BM.Standard.E2.64",
         "BM.Standard.E3.128",
+        "BM.GPU4.8",
         "BM.Standard1.36",
         "BM.HighIO1.36",
         "BM.DenseIO1.36",
@@ -3746,7 +3824,6 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
-        "BM.DenseIO2.52",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
@@ -3963,6 +4040,7 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
+        "BM.DenseIO2.52",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
@@ -3975,9 +4053,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Oracle-Linux-7.9-2020.11.10-1",
+      "display_name": "Oracle-Linux-7.9-2020.12.16-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaxdnx3den32vwplngpeu44zakw7lxup7vcdd3jmke4pfleaug3m6q",
+      "id": "ocid1.image.oc1.phx.aaaaaaaaykn4jrvc7z742odk6c5ilyzoijju6zzvtm2nn5w7i6pwqwnub74a",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -4001,7 +4079,6 @@
         "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
-        "VM.Standard.A1.Flex",
         "VM.Standard.B1.1",
         "VM.Standard.B1.16",
         "VM.Standard.B1.2",
@@ -4040,7 +4117,7 @@
       ],
       "size_in_mbs": 47694,
       "sort_key": "Oracle Linux 7.9",
-      "time_created": "2020-11-11T06:17:35.790000+00:00"
+      "time_created": "2020-12-16T20:47:12.898000+00:00"
     },
     {
       "agent_features": null,
@@ -4048,9 +4125,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Oracle-Linux-7.9-2020.10.26-0",
+      "display_name": "Oracle-Linux-7.9-2020.11.10-1",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaacirjuulpw2vbdiogz3jtcw3cdd3u5iuangemxq5f5ajfox3aplxa",
+      "id": "ocid1.image.oc1.phx.aaaaaaaaxdnx3den32vwplngpeu44zakw7lxup7vcdd3jmke4pfleaug3m6q",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -4074,6 +4151,7 @@
         "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
+        "VM.Standard.A1.Flex",
         "VM.Standard.B1.1",
         "VM.Standard.B1.16",
         "VM.Standard.B1.2",
@@ -4112,7 +4190,7 @@
       ],
       "size_in_mbs": 47694,
       "sort_key": "Oracle Linux 7.9",
-      "time_created": "2020-10-27T06:35:40.075000+00:00"
+      "time_created": "2020-11-11T06:17:35.790000+00:00"
     },
     {
       "agent_features": null,
@@ -4120,9 +4198,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Oracle-Linux-8.3-Gen2-GPU-2021.01.12-0",
+      "display_name": "Oracle-Linux-7.9-2020.10.26-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaa7zfitddebg2o6rfwqtlc7g7vpkikole4ltif6cq45rwbdvvxg2va",
+      "id": "ocid1.image.oc1.phx.aaaaaaaacirjuulpw2vbdiogz3jtcw3cdd3u5iuangemxq5f5ajfox3aplxa",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -4134,18 +4212,18 @@
       },
       "lifecycle_state": "AVAILABLE",
       "operating_system": "Oracle Linux",
-      "operating_system_version": "8",
+      "operating_system_version": "7.9",
       "shapes": [
+        "VM.DenseIO1.16",
+        "VM.DenseIO1.4",
+        "VM.DenseIO1.8",
+        "VM.DenseIO2.16",
+        "VM.DenseIO2.24",
+        "VM.DenseIO2.8",
         "VM.GPU2.1",
         "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
-        "BM.GPU4.8",
-        "BM.GPU2.2",
-        "BM.GPU3.8",
-        "VM.GPU3.1",
-        "VM.GPU3.2",
-        "VM.GPU3.4",
         "VM.Standard.B1.1",
         "VM.Standard.B1.16",
         "VM.Standard.B1.2",
@@ -4170,6 +4248,7 @@
         "VM.Standard2.8",
         "BM.Standard.E2.64",
         "BM.Standard.E3.128",
+        "BM.GPU4.8",
         "BM.Standard1.36",
         "BM.HighIO1.36",
         "BM.DenseIO1.36",
@@ -4179,12 +4258,11 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
-        "BM.DenseIO2.52",
         "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
-      "sort_key": "Oracle Linux 8",
-      "time_created": "2021-01-11T19:05:36.782000+00:00"
+      "sort_key": "Oracle Linux 7.9",
+      "time_created": "2020-10-27T06:35:40.075000+00:00"
     },
     {
       "agent_features": null,
@@ -4192,9 +4270,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Oracle-Linux-8.3-2021.01.12-0",
+      "display_name": "Oracle-Linux-8.3-Gen2-GPU-2021.01.12-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaatgj6aodlwvyrwlmd6pjrfk3ccr4fv23mw56l3gwsy6cnze56d4ja",
+      "id": "ocid1.image.oc1.phx.aaaaaaaa7zfitddebg2o6rfwqtlc7g7vpkikole4ltif6cq45rwbdvvxg2va",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -4208,16 +4286,16 @@
       "operating_system": "Oracle Linux",
       "operating_system_version": "8",
       "shapes": [
-        "VM.DenseIO1.16",
-        "VM.DenseIO1.4",
-        "VM.DenseIO1.8",
-        "VM.DenseIO2.16",
-        "VM.DenseIO2.24",
-        "VM.DenseIO2.8",
         "VM.GPU2.1",
         "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
+        "BM.GPU4.8",
+        "BM.GPU2.2",
+        "BM.GPU3.8",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
         "VM.Standard.B1.1",
         "VM.Standard.B1.16",
         "VM.Standard.B1.2",
@@ -4255,7 +4333,7 @@
       ],
       "size_in_mbs": 47694,
       "sort_key": "Oracle Linux 8",
-      "time_created": "2021-01-11T19:05:56.733000+00:00"
+      "time_created": "2021-01-11T19:05:36.782000+00:00"
     },
     {
       "agent_features": null,
@@ -4263,9 +4341,9 @@
       "compartment_id": null,
       "create_image_allowed": true,
       "defined_tags": {},
-      "display_name": "Oracle-Linux-8.3-2020.12.17-0",
+      "display_name": "Oracle-Linux-8.3-2021.01.12-0",
       "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaachy5qla6fy7pmkxf44r7ixoz6qybnkv7zsd3psxahihvbc54ahea",
+      "id": "ocid1.image.oc1.phx.aaaaaaaatgj6aodlwvyrwlmd6pjrfk3ccr4fv23mw56l3gwsy6cnze56d4ja",
       "launch_mode": "NATIVE",
       "launch_options": {
         "boot_volume_type": "PARAVIRTUALIZED",
@@ -4326,7 +4404,78 @@
       ],
       "size_in_mbs": 47694,
       "sort_key": "Oracle Linux 8",
-      "time_created": "2020-12-20T20:30:36.361000+00:00"
+      "time_created": "2021-01-11T19:05:56.733000+00:00"
+    },
+    {
+      "agent_features": null,
+      "base_image_id": null,
+      "compartment_id": null,
+      "create_image_allowed": true,
+      "defined_tags": {},
+      "display_name": "Oracle-Linux-8.3-2020.12.17-0",
+      "freeform_tags": {},
+      "id": "ocid1.image.oc1.phx.aaaaaaaachy5qla6fy7pmkxf44r7ixoz6qybnkv7zsd3psxahihvbc54ahea",
+      "launch_mode": "NATIVE",
+      "launch_options": {
+        "boot_volume_type": "PARAVIRTUALIZED",
+        "firmware": "UEFI_64",
+        "is_consistent_volume_naming_enabled": true,
+        "is_pv_encryption_in_transit_enabled": true,
+        "network_type": "PARAVIRTUALIZED",
+        "remote_data_volume_type": "PARAVIRTUALIZED"
+      },
+      "lifecycle_state": "AVAILABLE",
+      "operating_system": "Oracle Linux",
+      "operating_system_version": "8",
+      "shapes": [
+        "VM.DenseIO1.16",
+        "VM.DenseIO1.4",
+        "VM.DenseIO1.8",
+        "VM.DenseIO2.16",
+        "VM.DenseIO2.24",
+        "VM.DenseIO2.8",
+        "VM.GPU2.1",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard.B1.1",
+        "VM.Standard.B1.16",
+        "VM.Standard.B1.2",
+        "VM.Standard.B1.4",
+        "VM.Standard.B1.8",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.1.Micro",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard.E3.Flex",
+        "VM.Standard1.1",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8",
+        "BM.Standard.E2.64",
+        "BM.Standard.E3.128",
+        "BM.Standard1.36",
+        "BM.HighIO1.36",
+        "BM.DenseIO1.36",
+        "x5-2.36.512.nvme-6.4-Internal",
+        "BM.Standard.B1.44",
+        "BM.GPU2.2",
+        "BM.HPC2.36",
+        "BM.Standard2.52",
+        "BM.GPU3.8",
+        "BM.DenseIO2.52"
+      ],
+      "size_in_mbs": 47694,
+      "sort_key": "Oracle Linux 8",
+      "time_created": "2020-12-20T20:30:36.361000+00:00"
     },
     {
       "agent_features": null,
@@ -4356,7 +4505,44 @@
         "VM.GPU3.4",
         "BM.GPU4.8",
         "BM.GPU2.2",
-        "BM.GPU3.8"
+        "BM.GPU3.8",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard.B1.1",
+        "VM.Standard.B1.16",
+        "VM.Standard.B1.2",
+        "VM.Standard.B1.4",
+        "VM.Standard.B1.8",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.1.Micro",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard.E3.Flex",
+        "VM.Standard1.1",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8",
+        "BM.Standard.E2.64",
+        "BM.Standard.E3.128",
+        "BM.Standard1.36",
+        "BM.HighIO1.36",
+        "BM.DenseIO1.36",
+        "x5-2.36.512.nvme-6.4-Internal",
+        "BM.Standard.B1.44",
+        "BM.GPU2.2",
+        "BM.HPC2.36",
+        "BM.Standard2.52",
+        "BM.GPU3.8",
+        "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
       "sort_key": "Oracle Linux 8",
@@ -4390,7 +4576,44 @@
         "VM.GPU3.4",
         "BM.GPU4.8",
         "BM.GPU2.2",
-        "BM.GPU3.8"
+        "BM.GPU3.8",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard.B1.1",
+        "VM.Standard.B1.16",
+        "VM.Standard.B1.2",
+        "VM.Standard.B1.4",
+        "VM.Standard.B1.8",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.1.Micro",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard.E3.Flex",
+        "VM.Standard1.1",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8",
+        "BM.Standard.E2.64",
+        "BM.Standard.E3.128",
+        "BM.Standard1.36",
+        "BM.HighIO1.36",
+        "BM.DenseIO1.36",
+        "x5-2.36.512.nvme-6.4-Internal",
+        "BM.Standard.B1.44",
+        "BM.GPU2.2",
+        "BM.HPC2.36",
+        "BM.Standard2.52",
+        "BM.GPU3.8",
+        "BM.DenseIO2.52"
       ],
       "size_in_mbs": 47694,
       "sort_key": "Oracle Linux 8",
@@ -4593,8 +4816,9 @@
       "operating_system_version": "Server 2012 R2 Datacenter",
       "shapes": [
         "BM.Standard.E2.64",
-        "BM.HPC2.36",
+        "BM.DenseIO2.52",
         "BM.Standard2.52",
+        "BM.GPU3.8",
         "BM.GPU3.8"
       ],
       "size_in_mbs": 262144,
@@ -4624,9 +4848,8 @@
       "operating_system_version": "Server 2012 R2 Datacenter",
       "shapes": [
         "BM.DenseIO2.52",
-        "BM.HPC2.36",
-        "BM.Standard2.52",
-        "BM.GPU3.8",
+        "BM.HighIO1.36",
+        "BM.DenseIO1.36",
         "BM.GPU3.8"
       ],
       "size_in_mbs": 262144,
@@ -4659,7 +4882,7 @@
         "BM.DenseIO2.52",
         "BM.Standard2.52",
         "BM.GPU3.8",
-        "BM.GPU3.8"
+        "VM.Standard.E3.Flex"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Datacenter",
@@ -4688,8 +4911,9 @@
       "operating_system_version": "Server 2012 R2 Datacenter",
       "shapes": [
         "BM.DenseIO2.52",
-        "BM.HighIO1.36",
-        "BM.DenseIO1.36",
+        "BM.GPU2.2",
+        "BM.HPC2.36",
+        "BM.Standard2.52",
         "BM.GPU3.8"
       ],
       "size_in_mbs": 262144,
@@ -4754,7 +4978,15 @@
         "BM.GPU2.2",
         "BM.HPC2.36",
         "BM.Standard2.52",
-        "BM.GPU3.8"
+        "BM.GPU3.8",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Datacenter",
@@ -4786,7 +5018,16 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
-        "VM.Standard.E3.Flex"
+        "VM.Standard.E3.Flex",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8",
+        "BM.GPU4.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Datacenter",
@@ -4817,8 +5058,8 @@
         "BM.Standard1.36",
         "BM.HighIO1.36",
         "BM.DenseIO1.36",
-        "VM.Standard.E2.8",
-        "VM.Standard.E3.Flex",
+        "VM.GPU2.1",
+        "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
         "VM.Standard2.1",
@@ -4898,16 +5139,17 @@
         "BM.Standard1.36",
         "BM.HighIO1.36",
         "BM.DenseIO1.36",
-        "VM.GPU2.1",
-        "VM.GPU3.1",
-        "VM.GPU3.2",
-        "VM.GPU3.4",
-        "VM.Standard2.1",
+        "VM.Standard.E2.8",
+        "VM.Standard.E3.Flex",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
         "VM.Standard2.16",
         "VM.Standard2.2",
         "VM.Standard2.24",
         "VM.Standard2.4",
-        "VM.Standard2.8"
+        "VM.Standard2.8",
+        "BM.GPU4.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Datacenter",
@@ -4940,15 +5182,14 @@
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
         "VM.Standard.E3.Flex",
-        "VM.GPU3.2",
-        "VM.GPU3.4",
-        "VM.Standard2.1",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
         "VM.Standard2.16",
         "VM.Standard2.2",
         "VM.Standard2.24",
         "VM.Standard2.4",
-        "VM.Standard2.8",
-        "BM.GPU4.8"
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Standard",
@@ -4981,15 +5222,14 @@
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
         "VM.Standard.E3.Flex",
-        "VM.Standard1.2",
-        "VM.Standard1.4",
-        "VM.Standard1.8",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard2.1",
         "VM.Standard2.16",
         "VM.Standard2.2",
         "VM.Standard2.24",
         "VM.Standard2.4",
-        "VM.Standard2.8",
-        "BM.GPU4.8"
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Standard",
@@ -5022,14 +5262,15 @@
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
         "VM.Standard.E3.Flex",
-        "VM.Standard1.2",
-        "VM.Standard1.4",
-        "VM.Standard1.8",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard2.1",
         "VM.Standard2.16",
         "VM.Standard2.2",
         "VM.Standard2.24",
         "VM.Standard2.4",
-        "VM.Standard2.8"
+        "VM.Standard2.8",
+        "BM.GPU4.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Standard",
@@ -5109,8 +5350,7 @@
         "VM.Standard2.2",
         "VM.Standard2.24",
         "VM.Standard2.4",
-        "VM.Standard2.8",
-        "BM.GPU4.8"
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Standard",
@@ -5145,12 +5385,7 @@
         "VM.Standard1.16",
         "VM.Standard1.2",
         "VM.Standard1.4",
-        "VM.Standard1.8",
-        "VM.Standard2.16",
-        "VM.Standard2.2",
-        "VM.Standard2.24",
-        "VM.Standard2.4",
-        "VM.Standard2.8"
+        "VM.Standard1.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2012 R2 Standard",
@@ -5250,14 +5485,9 @@
       "operating_system_version": "Server 2016 Datacenter",
       "shapes": [
         "BM.Standard.E2.64",
-        "VM.DenseIO1.4",
-        "VM.DenseIO1.8",
-        "VM.Standard1.1",
-        "VM.Standard1.16",
-        "VM.Standard1.2",
-        "VM.Standard1.4",
-        "VM.Standard1.8",
-        "BM.GPU4.8"
+        "BM.DenseIO2.52",
+        "BM.Standard2.52",
+        "BM.GPU3.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2016 Datacenter",
@@ -5289,10 +5519,19 @@
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
-        "VM.Standard1.16",
-        "VM.Standard1.2",
-        "VM.Standard1.4",
-        "VM.Standard1.8"
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2016 Datacenter",
@@ -5323,7 +5562,20 @@
         "VM.Standard.A1.Flex",
         "BM.DenseIO2.52",
         "BM.Standard2.52",
-        "BM.GPU3.8"
+        "BM.GPU3.8",
+        "VM.GPU3.1",
+        "VM.GPU3.2",
+        "VM.GPU3.4",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2016 Datacenter",
@@ -5352,10 +5604,10 @@
       "operating_system_version": "Server 2016 Datacenter",
       "shapes": [
         "BM.DenseIO2.52",
+        "BM.GPU2.2",
         "BM.HPC2.36",
         "BM.Standard2.52",
         "BM.GPU3.8",
-        "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
         "VM.Standard.E2.1",
@@ -5490,6 +5742,7 @@
         "VM.GPU3.1",
         "VM.GPU3.2",
         "VM.GPU3.4",
+        "VM.Standard.A1.Flex",
         "VM.Standard.E2.1",
         "VM.Standard.E2.2",
         "VM.Standard.E2.4",
@@ -5702,7 +5955,16 @@
         "VM.Standard1.16",
         "VM.Standard1.2",
         "VM.Standard1.4",
-        "VM.Standard1.8"
+        "VM.Standard1.8",
+        "VM.Standard.E2.2",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2016 Standard",
@@ -5735,9 +5997,18 @@
         "VM.Standard.B1.2",
         "VM.Standard.B1.4",
         "VM.Standard.B1.8",
+        "VM.Standard1.16",
         "VM.Standard1.2",
         "VM.Standard1.4",
-        "VM.Standard1.8"
+        "VM.Standard1.8",
+        "VM.Standard.E2.4",
+        "VM.Standard.E2.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
+        "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2016 Standard",
@@ -5781,6 +6052,16 @@
         "VM.Standard2.2",
         "VM.Standard2.24",
         "VM.Standard2.4",
+        "VM.Standard2.8",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
+        "VM.Standard2.1",
+        "VM.Standard2.16",
+        "VM.Standard2.2",
+        "VM.Standard2.24",
+        "VM.Standard2.4",
         "VM.Standard2.8"
       ],
       "size_in_mbs": 262144,
@@ -5818,8 +6099,18 @@
         "VM.Standard1.2",
         "VM.Standard1.4",
         "VM.Standard1.8",
+        "VM.Standard.B1.2",
+        "VM.Standard.B1.4",
+        "VM.Standard.B1.8",
+        "VM.Standard.E2.1",
+        "VM.Standard.E2.2",
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
+        "VM.Standard1.1",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8",
         "VM.Standard2.1",
         "VM.Standard2.16",
         "VM.Standard2.2",
@@ -5861,15 +6152,15 @@
         "VM.Standard1.2",
         "VM.Standard1.4",
         "VM.Standard1.8",
+        "VM.Standard.B1.16",
+        "VM.Standard.B1.2",
+        "VM.Standard.B1.4",
+        "VM.Standard.B1.8",
+        "VM.Standard.E2.1",
         "VM.Standard.E2.2",
         "VM.Standard.E2.4",
         "VM.Standard.E2.8",
-        "VM.Standard2.1",
-        "VM.Standard2.16",
-        "VM.Standard2.2",
-        "VM.Standard2.24",
-        "VM.Standard2.4",
-        "VM.Standard2.8",
+        "VM.Standard1.1",
         "VM.Standard1.16",
         "VM.Standard1.2",
         "VM.Standard1.4",
@@ -6178,10 +6469,13 @@
       "operating_system_version": "Server 2019 Standard",
       "shapes": [
         "VM.Standard.E3.Flex",
-        "VM.Standard.B1.16",
-        "VM.Standard.B1.2",
-        "VM.Standard.B1.4",
-        "VM.Standard.B1.8"
+        "VM.DenseIO1.4",
+        "VM.DenseIO1.8",
+        "VM.Standard1.1",
+        "VM.Standard1.16",
+        "VM.Standard1.2",
+        "VM.Standard1.4",
+        "VM.Standard1.8"
       ],
       "size_in_mbs": 262144,
       "sort_key": "Windows Server 2019 Standard",
@@ -6257,76 +6551,6 @@
       "sort_key": "Windows Server 2019 Standard",
       "time_created": "2020-10-26T16:59:30.290000+00:00"
     },
-    {
-      "agent_features": null,
-      "base_image_id": null,
-      "compartment_id": null,
-      "create_image_allowed": true,
-      "defined_tags": {},
-      "display_name": "Windows-Server-2016-Standard-Edition-VM-2020.08.26-0",
-      "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaaqcpoop4jtnfeg6xh4zenwrnznyokp3bl5kimyuvjjn3p6xx4iwoa",
-      "launch_mode": "NATIVE",
-      "launch_options": {
-        "boot_volume_type": "PARAVIRTUALIZED",
-        "firmware": "UEFI_64",
-        "is_consistent_volume_naming_enabled": false,
-        "is_pv_encryption_in_transit_enabled": true,
-        "network_type": "VFIO",
-        "remote_data_volume_type": "PARAVIRTUALIZED"
-      },
-      "lifecycle_state": "AVAILABLE",
-      "operating_system": "Windows",
-      "operating_system_version": "Server 2016 Standard",
-      "shapes": [
-        "VM.DenseIO1.16",
-        "VM.DenseIO1.4",
-        "VM.DenseIO1.8",
-        "VM.Standard1.1",
-        "VM.Standard1.16",
-        "VM.Standard1.2",
-        "VM.Standard1.4",
-        "VM.Standard1.8"
-      ],
-      "size_in_mbs": 262144,
-      "sort_key": "Windows Server 2016 Standard",
-      "time_created": "2020-08-27T05:46:33.456000+00:00"
-    },
-    {
-      "agent_features": null,
-      "base_image_id": null,
-      "compartment_id": null,
-      "create_image_allowed": true,
-      "defined_tags": {},
-      "display_name": "Windows-Server-2016-Standard-Edition-VM-2020.07.17-0",
-      "freeform_tags": {},
-      "id": "ocid1.image.oc1.phx.aaaaaaaa5zmw4bsqelqnloagnhf7waqfdzhb2knh5dfor57srt2xapj7e4sq",
-      "launch_mode": "NATIVE",
-      "launch_options": {
-        "boot_volume_type": "PARAVIRTUALIZED",
-        "firmware": "UEFI_64",
-        "is_consistent_volume_naming_enabled": false,
-        "is_pv_encryption_in_transit_enabled": true,
-        "network_type": "VFIO",
-        "remote_data_volume_type": "PARAVIRTUALIZED"
-      },
-      "lifecycle_state": "AVAILABLE",
-      "operating_system": "Windows",
-      "operating_system_version": "Server 2016 Standard",
-      "shapes": [
-        "VM.DenseIO1.16",
-        "VM.DenseIO1.4",
-        "VM.DenseIO1.8",
-        "VM.Standard1.1",
-        "VM.Standard1.16",
-        "VM.Standard1.2",
-        "VM.Standard1.4",
-        "VM.Standard1.8"
-      ],
-      "size_in_mbs": 262144,
-      "sort_key": "Windows Server 2016 Standard",
-      "time_created": "2020-07-22T21:47:14.316000+00:00"
-    },
     {
       "agent_features": null,
       "base_image_id": null,
@@ -6986,6 +7210,11 @@
     }
   ],
   "mysql_shapes": [
+    {
+      "cpu_core_count": 16,
+      "memory_size_in_gbs": 512,
+      "name": "MySQL.HeatWave.VM.Standard.E3"
+    },
     {
       "cpu_core_count": 1,
       "memory_size_in_gbs": 16,
@@ -7372,6 +7601,11 @@
       "display_name": "integration",
       "name": "integration"
     },
+    {
+      "description": "Java Management",
+      "display_name": "java-management",
+      "name": "java-management"
+    },
     {
       "description": "Key Management",
       "display_name": "kms",
@@ -7437,6 +7671,11 @@
       "display_name": "ocvp",
       "name": "ocvp"
     },
+    {
+      "description": "Operations Insights",
+      "display_name": "operations-insights",
+      "name": "operations-insights"
+    },
     {
       "description": "Optimizer",
       "display_name": "optimizer",
@@ -7497,6 +7736,11 @@
       "display_name": "vpn",
       "name": "vpn"
     },
+    {
+      "description": "Vulnerability Scanning",
+      "display_name": "vulnerability-scanning",
+      "name": "vulnerability-scanning"
+    },
     {
       "description": "WaaS",
       "display_name": "waas",
diff --git a/okitweb/static/okit/json/release.json b/okitweb/static/okit/json/release.json
index bcb4fea39..365ddb65f 100644
--- a/okitweb/static/okit/json/release.json
+++ b/okitweb/static/okit/json/release.json
@@ -1,4 +1,4 @@
 {
-  "release": "0.16.0",
-  "tag": "v0.16.0"
+  "release": "0.17.0",
+  "tag": "v0.17.0"
 }
\ No newline at end of file
diff --git a/okitweb/static/okit/model/js/artefacts/autonomous_database.js b/okitweb/static/okit/model/js/artefacts/autonomous_database.js
index a76124d19..421233b0f 100644
--- a/okitweb/static/okit/model/js/artefacts/autonomous_database.js
+++ b/okitweb/static/okit/model/js/artefacts/autonomous_database.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Autonomous Database Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/block_storage_volume.js b/okitweb/static/okit/model/js/artefacts/block_storage_volume.js
index ad60e60a3..4fd018fa8 100644
--- a/okitweb/static/okit/model/js/artefacts/block_storage_volume.js
+++ b/okitweb/static/okit/model/js/artefacts/block_storage_volume.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/compartment.js b/okitweb/static/okit/model/js/artefacts/compartment.js
index 4618bf76d..4b82e38a7 100644
--- a/okitweb/static/okit/model/js/artefacts/compartment.js
+++ b/okitweb/static/okit/model/js/artefacts/compartment.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Compartment Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/customer_premise_equipment.js b/okitweb/static/okit/model/js/artefacts/customer_premise_equipment.js
index 0f3e8bb7c..bfa2c1516 100644
--- a/okitweb/static/okit/model/js/artefacts/customer_premise_equipment.js
+++ b/okitweb/static/okit/model/js/artefacts/customer_premise_equipment.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded CustomerPremiseEquipment Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/database_system.js b/okitweb/static/okit/model/js/artefacts/database_system.js
index 165938e52..66e617610 100644
--- a/okitweb/static/okit/model/js/artefacts/database_system.js
+++ b/okitweb/static/okit/model/js/artefacts/database_system.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Database System Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/dynamic_routing_gateway.js b/okitweb/static/okit/model/js/artefacts/dynamic_routing_gateway.js
index 54d41dbd5..36e2058c8 100644
--- a/okitweb/static/okit/model/js/artefacts/dynamic_routing_gateway.js
+++ b/okitweb/static/okit/model/js/artefacts/dynamic_routing_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Dynamic Routing Gateway Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/fast_connect.js b/okitweb/static/okit/model/js/artefacts/fast_connect.js
index 2a2bc1e52..6906b5d09 100644
--- a/okitweb/static/okit/model/js/artefacts/fast_connect.js
+++ b/okitweb/static/okit/model/js/artefacts/fast_connect.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded FastConnect Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/file_storage_system.js b/okitweb/static/okit/model/js/artefacts/file_storage_system.js
index 5af591f07..ae02a3cd9 100644
--- a/okitweb/static/okit/model/js/artefacts/file_storage_system.js
+++ b/okitweb/static/okit/model/js/artefacts/file_storage_system.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded File Storage System Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/fragment.js b/okitweb/static/okit/model/js/artefacts/fragment.js
index 971c39a41..282d62221 100644
--- a/okitweb/static/okit/model/js/artefacts/fragment.js
+++ b/okitweb/static/okit/model/js/artefacts/fragment.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Model Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/instance.js b/okitweb/static/okit/model/js/artefacts/instance.js
index 01ae45424..68f010e49 100644
--- a/okitweb/static/okit/model/js/artefacts/instance.js
+++ b/okitweb/static/okit/model/js/artefacts/instance.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Instance Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/instance_pool.js b/okitweb/static/okit/model/js/artefacts/instance_pool.js
index 47f26f605..e88635e65 100644
--- a/okitweb/static/okit/model/js/artefacts/instance_pool.js
+++ b/okitweb/static/okit/model/js/artefacts/instance_pool.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Instance Pool Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/internet_gateway.js b/okitweb/static/okit/model/js/artefacts/internet_gateway.js
index a5fb8a856..33c80f2e0 100644
--- a/okitweb/static/okit/model/js/artefacts/internet_gateway.js
+++ b/okitweb/static/okit/model/js/artefacts/internet_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Internet Gateway Javascript');
@@ -18,8 +18,6 @@ class InternetGateway extends OkitArtifact {
         this.compartment_id = data.compartment_id;
         this.vcn_id = data.parent_id;
         this.enabled = true;
-        this.freeform_tags = {};
-        this.defined_tags = {};
         // Update with any passed data
         this.merge(data);
         this.convert();
diff --git a/okitweb/static/okit/model/js/artefacts/ipsec_connection.js b/okitweb/static/okit/model/js/artefacts/ipsec_connection.js
index 9d7f5181c..a1c73ee89 100644
--- a/okitweb/static/okit/model/js/artefacts/ipsec_connection.js
+++ b/okitweb/static/okit/model/js/artefacts/ipsec_connection.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded IPSecConnection Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/load_balancer.js b/okitweb/static/okit/model/js/artefacts/load_balancer.js
index 09f64c25d..1486bcd8f 100644
--- a/okitweb/static/okit/model/js/artefacts/load_balancer.js
+++ b/okitweb/static/okit/model/js/artefacts/load_balancer.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Load Balancer Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/local_peering_gateway.js b/okitweb/static/okit/model/js/artefacts/local_peering_gateway.js
index d2061e94b..ab36681bd 100644
--- a/okitweb/static/okit/model/js/artefacts/local_peering_gateway.js
+++ b/okitweb/static/okit/model/js/artefacts/local_peering_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Local Peering Gateway Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/mysql_database_system.js b/okitweb/static/okit/model/js/artefacts/mysql_database_system.js
index c0e6c566e..23e74666c 100644
--- a/okitweb/static/okit/model/js/artefacts/mysql_database_system.js
+++ b/okitweb/static/okit/model/js/artefacts/mysql_database_system.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Database System Javascript');
@@ -25,7 +25,7 @@ class MySQLDatabaseSystem extends OkitArtifact {
         this.admin_password = '';
         this.description ='';
         this.mysql_version = '';
-        this.port = '';
+        this.v = '';
         this.port_x = '';
         this.data_storage_size_in_gb = 256;
         this.fault_domain = '';
diff --git a/okitweb/static/okit/model/js/artefacts/nat_gateway.js b/okitweb/static/okit/model/js/artefacts/nat_gateway.js
index aeaf8190f..88e5c6832 100644
--- a/okitweb/static/okit/model/js/artefacts/nat_gateway.js
+++ b/okitweb/static/okit/model/js/artefacts/nat_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded NAT Gateway Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/network_security_group.js b/okitweb/static/okit/model/js/artefacts/network_security_group.js
index 8a4ce33e5..a8fe9d3ce 100644
--- a/okitweb/static/okit/model/js/artefacts/network_security_group.js
+++ b/okitweb/static/okit/model/js/artefacts/network_security_group.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Network Security Group Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/object_storage_bucket.js b/okitweb/static/okit/model/js/artefacts/object_storage_bucket.js
index 2a081abee..ee2499001 100644
--- a/okitweb/static/okit/model/js/artefacts/object_storage_bucket.js
+++ b/okitweb/static/okit/model/js/artefacts/object_storage_bucket.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Object Storage Bucket Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/oke_cluster.js b/okitweb/static/okit/model/js/artefacts/oke_cluster.js
index bc948e020..907181646 100644
--- a/okitweb/static/okit/model/js/artefacts/oke_cluster.js
+++ b/okitweb/static/okit/model/js/artefacts/oke_cluster.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKE Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/remote_peering_connection.js b/okitweb/static/okit/model/js/artefacts/remote_peering_connection.js
index ac450b321..a3df5ffd9 100644
--- a/okitweb/static/okit/model/js/artefacts/remote_peering_connection.js
+++ b/okitweb/static/okit/model/js/artefacts/remote_peering_connection.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded RemotePeeringConnection Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/route_table.js b/okitweb/static/okit/model/js/artefacts/route_table.js
index 76bcfccb1..9f8b77adf 100644
--- a/okitweb/static/okit/model/js/artefacts/route_table.js
+++ b/okitweb/static/okit/model/js/artefacts/route_table.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Route Table Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/security_list.js b/okitweb/static/okit/model/js/artefacts/security_list.js
index bd904c5d8..804cef92b 100644
--- a/okitweb/static/okit/model/js/artefacts/security_list.js
+++ b/okitweb/static/okit/model/js/artefacts/security_list.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Security List Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/service_gateway.js b/okitweb/static/okit/model/js/artefacts/service_gateway.js
index faaee45ba..6365ae94f 100644
--- a/okitweb/static/okit/model/js/artefacts/service_gateway.js
+++ b/okitweb/static/okit/model/js/artefacts/service_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Service Gateway Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/subnet.js b/okitweb/static/okit/model/js/artefacts/subnet.js
index 086f6314d..52ec74bff 100644
--- a/okitweb/static/okit/model/js/artefacts/subnet.js
+++ b/okitweb/static/okit/model/js/artefacts/subnet.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Subnet Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
index c5e62929c..6bef02a05 100644
--- a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
+++ b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Virtual Cloud Network Javascript');
diff --git a/okitweb/static/okit/model/js/artefacts/virtual_network_interface.js b/okitweb/static/okit/model/js/artefacts/virtual_network_interface.js
index a8be4e1ba..f6bdf2217 100644
--- a/okitweb/static/okit/model/js/artefacts/virtual_network_interface.js
+++ b/okitweb/static/okit/model/js/artefacts/virtual_network_interface.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Virtual Network Interface Javascript');
diff --git a/okitweb/static/okit/model/js/okit_model.js b/okitweb/static/okit/model/js/okit_model.js
index 184256303..53199fe26 100644
--- a/okitweb/static/okit/model/js/okit_model.js
+++ b/okitweb/static/okit/model/js/okit_model.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Model Javascript');
@@ -977,7 +977,6 @@ class OkitArtifact {
         // All Artefacts will have compartment id, display name & description
         this.compartment_id = '';
         this.display_name = '';
-        this.name = '';
         this.definition = '';
         // Add default for common Tag variables
         this.freeform_tags = {};
@@ -987,6 +986,14 @@ class OkitArtifact {
                 return okitjson;
             }
         });
+        Object.defineProperty(this, 'name', {
+            get: function () {
+                return this.display_name;
+            },
+            set: function (name) {
+                return this.display_name = name;
+            }
+        });
     }
 
     get okit_id() {return 'okit.' + this.constructor.name.toLowerCase() + '.' + uuidv4();}
@@ -1138,3 +1145,4 @@ class OkitRegions {
     }
 }
 
+let okitJsonModel
diff --git a/okitweb/static/okit/query/oci/js/okit_query.js b/okitweb/static/okit/query/oci/js/okit_query.js
index 482a5a532..e671858b4 100644
--- a/okitweb/static/okit/query/oci/js/okit_query.js
+++ b/okitweb/static/okit/query/oci/js/okit_query.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT OCI Query Javascript');
diff --git a/okitweb/static/okit/templates/reference_architecture/cockroachdb_cluster.json b/okitweb/static/okit/templates/reference_architecture/cockroachdb_cluster.json
index 4c2449dba..eb3aebc23 100644
--- a/okitweb/static/okit/templates/reference_architecture/cockroachdb_cluster.json
+++ b/okitweb/static/okit/templates/reference_architecture/cockroachdb_cluster.json
@@ -9,7 +9,6 @@
       "id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "compartment_id": "canvas",
       "display_name": "cockroachdb-ref-arch",
-      "name": "cockroachdb-ref-arch",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -28,7 +27,6 @@
       "id": "okit.instance.09d61992-634d-4f93-9830-ee7d56cf0a74",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb1",
-      "name": "cockroachdb1",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -77,7 +75,6 @@
       "id": "okit.instance.0cab33c7-65f5-48bb-a7c5-5ea01b561ea4",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb2",
-      "name": "cockroachdb2",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -126,7 +123,6 @@
       "id": "okit.instance.a7f1ca69-1fc7-40a4-bf11-fff80d6ce913",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb3",
-      "name": "cockroachdb3",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -175,7 +171,6 @@
       "id": "okit.instance.f46d75d0-185d-487d-b42d-697a8226504c",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "bastion",
-      "name": "bastion",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -227,7 +222,6 @@
       "id": "okit.internetgateway.a09a99ee-ac4b-49ed-978a-6a6c18dfd2fd",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "okit-ig001",
-      "name": "",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -242,7 +236,6 @@
       "id": "okit.loadbalancer.2785fb86-0028-4ba3-8158-68ce55e6a204",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb-lb001",
-      "name": "cockroachdb-lb001",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -275,7 +268,6 @@
       "id": "okit.natgateway.784af6f7-e4fa-4702-a409-c7f13ba0ccfa",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "okit-ng001",
-      "name": "",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -293,7 +285,6 @@
       "id": "okit.routetable.b0dec644-9c56-402e-adb9-c8149b890b61",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "okit-rt001",
-      "name": "",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -312,7 +303,6 @@
       "id": "okit.routetable.1cbfeeef-2905-45c9-9778-631e48396309",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "okit-rt002",
-      "name": "",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -334,7 +324,6 @@
       "id": "okit.securitylist.d0e6987b-59e8-4e61-be2f-36b346b37a31",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "okit-sl001",
-      "name": "",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
@@ -533,7 +522,6 @@
       "id": "okit.securitylist.d6c25389-1c49-43de-bc87-aaf475656ec4",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "okit-sl002",
-      "name": "",
       "definition": "Restrict Ingress access to the resources on the public subnet. Although all Egress is allowed.",
       "freeform_tags": {},
       "defined_tags": {},
@@ -644,7 +632,6 @@
       "id": "okit.subnet.e218ba2c-8723-4332-b870-4c1b2dae0cf0",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb-public-sn",
-      "name": "cockroachdb-public-sn",
       "definition": "Public subnet restricted to the Loadbalancer and the Bastion Host. All access to the VMs running the cluster will be through either Loadbalancer or Bastion.",
       "freeform_tags": {},
       "defined_tags": {},
@@ -665,7 +652,6 @@
       "id": "okit.subnet.b5f2e59c-49e5-4afb-86f0-7386054f911d",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb-private-sn",
-      "name": "cockroachdb-private-sn",
       "definition": "Private subnet used to protect VMs from direct, inbound, access. Only accessible from IPs on the public subnet.",
       "freeform_tags": {},
       "defined_tags": {},
@@ -688,7 +674,6 @@
       "id": "okit.virtualcloudnetwork.4fcbf02a-e290-4460-a7df-ee48b9767924",
       "compartment_id": "okit.compartment.31e0ffd2-2747-4508-b5ad-776b6f60f9c7",
       "display_name": "cockroachdb-vcn001",
-      "name": "cockroachdb-vcn001",
       "definition": "",
       "freeform_tags": {},
       "defined_tags": {},
diff --git a/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js b/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js
index 0facca831..c271fdd32 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer AutonomousDatabase View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/block_storage_volume.js b/okitweb/static/okit/view/designer/js/artefacts/block_storage_volume.js
index 4d02ba226..35e1273f9 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/block_storage_volume.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/block_storage_volume.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer BlockStorageVolume View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/compartment.js b/okitweb/static/okit/view/designer/js/artefacts/compartment.js
index 8511d56b9..5cab8cc3e 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/compartment.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/compartment.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Compartment View Javascript');
@@ -75,7 +75,7 @@ class CompartmentView extends OkitContainerDesignerArtefactView {
     }
 
     getContainerArtifacts() {
-        return [Compartment.getArtifactReference(), VirtualCloudNetwork.getArtifactReference()];
+        return [Compartment.getArtifactReference(), VirtualCloudNetwork.getArtifactReference(), Subnet.getArtifactReference()];
     }
 
     getLeftArtifacts() {
diff --git a/okitweb/static/okit/view/designer/js/artefacts/customer_premise_equipment.js b/okitweb/static/okit/view/designer/js/artefacts/customer_premise_equipment.js
index de8d4bca2..5edd2d285 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/customer_premise_equipment.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/customer_premise_equipment.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer CustomerPremiseEquipment View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/database_system.js b/okitweb/static/okit/view/designer/js/artefacts/database_system.js
index 0aecd9ad8..10b30df3c 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/database_system.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/database_system.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer DatabaseSystem View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/dynamic_routing_gateway.js b/okitweb/static/okit/view/designer/js/artefacts/dynamic_routing_gateway.js
index 035021619..eafaeb6dc 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/dynamic_routing_gateway.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/dynamic_routing_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer DynamicRoutingGateway View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/fast_connect.js b/okitweb/static/okit/view/designer/js/artefacts/fast_connect.js
index 88e5e5498..e9e0ea411 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/fast_connect.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/fast_connect.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer FastConnect View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/file_storage_system.js b/okitweb/static/okit/view/designer/js/artefacts/file_storage_system.js
index 4c1f4cd39..13722a3f1 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/file_storage_system.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/file_storage_system.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer FileStorageSystem View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/fragment.js b/okitweb/static/okit/view/designer/js/artefacts/fragment.js
index 7f9d830b0..24a833367 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/fragment.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/fragment.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Fragment View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/instance.js b/okitweb/static/okit/view/designer/js/artefacts/instance.js
index 0554aea3b..6bf71305d 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/instance.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/instance.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Instance View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/instance_pool.js b/okitweb/static/okit/view/designer/js/artefacts/instance_pool.js
index 40017b852..3a8c79602 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/instance_pool.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/instance_pool.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Instance Pool View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/internet_gateway.js b/okitweb/static/okit/view/designer/js/artefacts/internet_gateway.js
index 789563ade..e1cf1c15e 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/internet_gateway.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/internet_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer InternetGateway View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js b/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js
index b95e2da12..c75a99c36 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer IPSecConnection View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/load_balancer.js b/okitweb/static/okit/view/designer/js/artefacts/load_balancer.js
index 7709f50b8..7fa6de8c7 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/load_balancer.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/load_balancer.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer LoadBalancer View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/local_peering_gateway.js b/okitweb/static/okit/view/designer/js/artefacts/local_peering_gateway.js
index e16948c52..c0ab1239b 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/local_peering_gateway.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/local_peering_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer LocalPeeringGateway View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js b/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js
index 932a8153c..7436d5895 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer MySQLDatabaseSystem View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js b/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js
index 25c6644ff..b77189250 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer NATGateway View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/network_security_group.js b/okitweb/static/okit/view/designer/js/artefacts/network_security_group.js
index 06d1ab73c..a2c0be4fd 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/network_security_group.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/network_security_group.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer NetworkSecurityGroup View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/object_storage_bucket.js b/okitweb/static/okit/view/designer/js/artefacts/object_storage_bucket.js
index 787457c0d..c57223916 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/object_storage_bucket.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/object_storage_bucket.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer ObjectStorageBucket View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/oke_cluster.js b/okitweb/static/okit/view/designer/js/artefacts/oke_cluster.js
index 4e3a5dd6c..5cbff6774 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/oke_cluster.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/oke_cluster.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer OKE View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/remote_peering_connection.js b/okitweb/static/okit/view/designer/js/artefacts/remote_peering_connection.js
index 7b55ab231..0a76595fd 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/remote_peering_connection.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/remote_peering_connection.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer RemotePeeringConnection View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/route_table.js b/okitweb/static/okit/view/designer/js/artefacts/route_table.js
index 2c6020217..848067ad9 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/route_table.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/route_table.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer RouteTable View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/security_list.js b/okitweb/static/okit/view/designer/js/artefacts/security_list.js
index a65c83781..d1cd43027 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/security_list.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/security_list.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer SecurityList View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/service_gateway.js b/okitweb/static/okit/view/designer/js/artefacts/service_gateway.js
index 60d0b506a..fe9814394 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/service_gateway.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/service_gateway.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer ServiceGateway View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/subnet.js b/okitweb/static/okit/view/designer/js/artefacts/subnet.js
index 2b19007e3..578e60e37 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/subnet.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/subnet.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer Subnet View Javascript');
@@ -12,8 +12,17 @@ class SubnetView extends OkitContainerDesignerArtefactView {
         super(artefact, json_view);
     }
 
-    get parent_id() {return this.artefact.vcn_id;}
-    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    get parent_id_orig() {return this.artefact.vcn_id;}
+    get parent_orig() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    get parent_id() {
+        const vcn = this.getJsonView().getVirtualCloudNetwork(this.artefact.vcn_id);
+        if (vcn && vcn.compartment_id === this.artefact.compartment_id) {
+            return this.artefact.vcn_id;
+        } else {
+            return this.compartment_id;
+        }
+    }
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id) ? this.getJsonView().getVirtualCloudNetwork(this.parent_id) : this.getJsonView().getCompartment(this.parent_id);}
     get children() {return [...this.json_view.getInstances(), ...this.json_view.getLoadBalancers(),
         ...this.json_view.getFileStorageSystems(), ...this.json_view.getAutonomousDatabases(),
         ...this.json_view.getDatabaseSystems(), ...this.json_view.getMySQLDatabaseSystems()].filter(child => child.parent_id === this.artefact.id);}
@@ -71,6 +80,10 @@ class SubnetView extends OkitContainerDesignerArtefactView {
         let me = this;
         $(jqId(PROPERTIES_PANEL)).load("propertysheets/subnet.html", () => {
             // Load Referenced Ids
+            // Virtual Cloud Network
+            this.loadVirtualCloudNetworkSelect('vcn_id');
+            $(jqId('vcn_id')).on('change', () => {if ($(jqId('vcn_id')).val() != '') me.artefact.generateCIDR();});
+            // Route Table
             let route_table_select = $(jqId('route_table_id'));
             route_table_select.append($('<option>').attr('value', '').text(''));
             for (let route_table of me.artefact.getOkitJson().route_tables) {
@@ -147,7 +160,7 @@ class SubnetView extends OkitContainerDesignerArtefactView {
     }
 
     static getDropTargets() {
-        return [VirtualCloudNetwork.getArtifactReference()];
+        return [VirtualCloudNetwork.getArtifactReference(), Compartment.getArtifactReference()];
     }
 
 }
\ No newline at end of file
diff --git a/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js
index ee4a832ff..424743723 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer VirtualCloudNetwork View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/artefacts/virtual_network_interface.js b/okitweb/static/okit/view/designer/js/artefacts/virtual_network_interface.js
index cafa4ac33..afda97a35 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/virtual_network_interface.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/virtual_network_interface.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Designer VirtualNetworkInterface View Javascript');
diff --git a/okitweb/static/okit/view/designer/js/okit_designer_view.js b/okitweb/static/okit/view/designer/js/okit_designer_view.js
index bd1c9897e..d01a64c96 100644
--- a/okitweb/static/okit/view/designer/js/okit_designer_view.js
+++ b/okitweb/static/okit/view/designer/js/okit_designer_view.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Designer View Javascript');
diff --git a/okitweb/static/okit/view/js/okit_view.js b/okitweb/static/okit/view/js/okit_view.js
index 4f944638e..1d572384c 100644
--- a/okitweb/static/okit/view/js/okit_view.js
+++ b/okitweb/static/okit/view/js/okit_view.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT View Javascript');
@@ -866,9 +866,13 @@ class OkitJsonView {
     // Subnet
     dropSubnetView(target) {
         let view_artefact = this.newSubnet();
-        view_artefact.getArtefact().vcn_id = target.id;
-        view_artefact.getArtefact().compartment_id = target.compartment_id;
-        view_artefact.getArtefact().generateCIDR();
+        if (target.type === VirtualCloudNetwork.getArtifactReference()) {
+            view_artefact.getArtefact().vcn_id = target.id;
+            view_artefact.getArtefact().compartment_id = target.compartment_id;
+            view_artefact.getArtefact().generateCIDR();
+        } else if (target.type === Compartment.getArtifactReference()) {
+            view_artefact.getArtefact().compartment_id = target.id;
+        }
         view_artefact.recalculate_dimensions = true;
         return view_artefact;
     }
@@ -2304,6 +2308,16 @@ class OkitArtefactView {
             drg_select.append($('<option>').attr('value', drg.id).text(drg.display_name));
         }
     }
+
+    loadVirtualCloudNetworkSelect(id) {
+        // Build Virtual Cloud Network
+        let select = $(jqId(id));
+        $(select).empty();
+        select.append($('<option>').attr('value', '').text(''));
+        for (const resource of this.getOkitJson().getVirtualCloudNetworks()) {
+            select.append($('<option>').attr('value', resource.id).text(resource.display_name));
+        }
+    }
 }
 
 /*
diff --git a/okitweb/static/okit/view/tabular/js/okit_tabular_view.js b/okitweb/static/okit/view/tabular/js/okit_tabular_view.js
new file mode 100644
index 000000000..f7959b9bd
--- /dev/null
+++ b/okitweb/static/okit/view/tabular/js/okit_tabular_view.js
@@ -0,0 +1,284 @@
+/*
+** Copyright (c) 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded OKIT Designer View Javascript');
+
+class OkitTabularJsonView extends OkitJsonView {
+
+    constructor(okitjson=null, oci_data=null, parent_id = 'tabular-div') {
+        super(okitjson);
+        this.oci_data = oci_data;
+        this.parent_id = parent_id;
+        this.loadPropertyMap();
+    }
+    get model() {return this.okitjson;}
+    get data() {return this.oci_data;}
+
+    static newView(model, parent_id = 'tabular-div') {
+        return new OkitTabularJsonView((model, parent_id))
+    }
+
+    loadPropertyMap() {
+        this.resource_property_map = {
+            common: {
+                'Name': {property: 'display_name'},
+                'Compartment': {property: 'compartment_id', lookup: 'model.getCompartment'}
+            },
+            compartments: {
+                'Description': {property: 'description'}
+            },
+            autonomous_databases: {
+                'Subnet': {property: 'subnet_id', lookup: 'model.getSubnet'},
+                'DB Name': {property: 'db_name'},
+                'Storage Size (Tbs)': {property: 'data_storage_size_in_tbs'},
+                'CPU Count': {property: 'cpu_core_count'},
+                'Workload': {property: 'db_workload'},
+                'Auto Scaling': {property: 'is_auto_scaling_enabled'},
+                'License Model': {property: 'license_model'},
+                'Security Groups': {property: 'nsg_ids', lookup: 'model.getNetworkSecurityGroup'},
+            },
+            block_storage_volumes: {
+                'Availability Domain': {property: 'availability_domain'},
+                'Size in Gbs': {property: 'size_in_gbs'},
+                'Backup Policy': {property: 'backup_policy'},
+                'VPUS/Gb': {property: 'vpus_per_gb'},
+            },
+            customer_premise_equipments: {
+                'IP Address': {property: 'ip_address'},
+                'Customer Device': {property: 'cpe_device_shape_id', lookup: 'data.getCpeDeviceShape'},
+            },
+            database_systems: {
+                'Availability Domain': {property: 'availability_domain'},
+                'Database Edition': {property: 'database_edition'},
+                'DB Name': {property: 'db_home.database.db_name'},
+                'Workload': {property: 'db_home.database.db_workload'},
+                'Version': {property: 'db_home.db_version'},
+                'Hostname': {property: 'hostname'},
+                'Cluster': {property: 'cluster_name'},
+                'Shape': {property: 'shape'},
+                'Subnet': {property: 'subnet_id', lookup: 'model.getSubnet'},
+                'License Model': {property: 'license_model'},
+                'Security Groups': {property: 'nsg_ids', lookup: 'model.getNetworkSecurityGroup'},
+            },
+            dynamic_routing_gateways: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+            },
+            fast_connects: {},
+            file_storage_systems: {
+                'Availability Domain': {property: 'availability_domain'},
+            },
+            instances: {
+                'Subnet': {property: 'subnet_id', lookup: 'model.getSubnet'}
+            },
+            instance_pools: {},
+            internet_gateways: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+                'Enable': {property: 'enabled'},
+            },
+            ipsec_connections: {
+                'Customer Premise Equipment': {property: 'cpe_id', lookup: 'model.getCustomerPremiseEquipment'},
+                'Dynamic Routing Gateway': {property: 'drg_id', lookup: 'model.getDynamicRoutingGateway'},
+            },
+            load_balancers: {
+                'Private': {property: 'is_private'},
+                'Shape': {property: 'shape'},
+                'Protocol': {property: 'protocol'},
+                'Port': {property: 'port'},
+                'Policy': {property: 'backend_policy'},
+                'Backends': {property: 'instance_ids', lookup: 'model.getInstance'},
+            },
+            local_peering_gateways: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+                'Route Table': {property: 'route_table_id', lookup: 'model.getRouteTable'},
+                'Peer': {property: 'peer_id', lookup: 'model.getLocalPeeringGateway'},
+            },
+            mysql_database_systems: {
+                'Availability Domain': {property: 'availability_domain'},
+                'Hostname': {property: 'hostname_label'},
+                'Version': {property: 'mysql_version'},
+                'Configuration': {property: 'configuration_id', lookup: 'data.getMySQLConfiguration'},
+                'Shape': {property: 'shape_name'},
+                'Port': {property: 'port'},
+                'Port X': {property: 'port_x'},
+                'Subnet': {property: 'subnet_id', lookup: 'model.getSubnet'},
+                'Description': {property: 'description'},
+            },
+            nat_gateways: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+                'Block Traffic': {property: 'block_traffic'},
+            },
+            network_security_groups: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+            },
+            object_storage_buckets: {
+                'Namespace': {property: 'namespace'},
+                'Storage Tier': {property: 'storage_tier'},
+                'Public Access': {property: 'public_access_type'},
+            },
+            oke_clusters: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+                'Dashboard': {property: 'options.add_ons.is_kubernetes_dashboard_enabled'},
+                'Tiller': {property: 'options.add_ons.is_tiller_enabled'},
+                'Security': {property: 'options.admission_controller_options.is_pod_security_policy_enabled'},
+                'Pod CIDR': {property: 'options.kubernetes_network_config.pods_cidr'},
+                'Service CIDR': {property: 'options.kubernetes_network_config.services_cidr'},
+            },
+            remote_peering_connections: {
+                'Dynamic Routing Gateway': {property: 'drg_id', lookup: 'model.getDynamicRoutingGateway'},
+                'Peer': {property: 'peer_id', lookup: 'model.getRemotePeeringConnection'},
+                'Peer Region': {property: 'peer_region_name'},
+            },
+            route_tables: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+            },
+            security_lists: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+            },
+            service_gateways: {
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+                'Route Table': {property: 'route_table_id', lookup: 'model.getRouteTable'},
+            },
+            subnets: {
+                'Availability Domain': {property: 'availability_domain'},
+                'Virtual Cloud Network': {property: 'vcn_id', lookup: 'model.getVirtualCloudNetwork'},
+                'CIDR Block': {property: 'cidr_block'},
+                'DNS Label': {property: 'dns_label'},
+                'Private': {property: 'prohibit_public_ip_on_vnic'},
+                'Route Table': {property: 'route_table_id', lookup: 'model.getRouteTable'},
+                'Security Lists': {property: 'security_list_ids', lookup: 'model.getSecurityList'},
+            },
+            virtual_cloud_networks: {
+                'CIDR Block': {property: 'cidr_block'},
+                'DNS Label': {property: 'dns_label'},
+            }
+        };
+    }
+
+    draw(for_export=false) {
+        this.newCanvas()
+    }
+
+    newCanvas(width=100, height=100, for_export=false) {
+        let canvas_div = d3.select(d3Id(this.parent_id));
+        // Empty existing Canvas
+        canvas_div.selectAll('*').remove();
+        // Add Tab Bar
+        const tabbar = canvas_div.append('div')
+            .attr('class', 'okit-tab-bar')
+            .attr('id', 'tabular_view_tab_bar');
+        // Add Tab Contents
+        const tab_content = canvas_div.append('div')
+            .attr('class', 'okit-tab-contents')
+            .attr('id', 'tabular_view_tab_contents')
+        // Loop through Model elements and create and create a tab for each
+        Object.entries(this.okitjson).forEach(([key, value]) => {
+            if (Array.isArray(value)) {
+                if (value.length) this.addTab(tabbar, key);
+            }
+        })
+    }
+
+    addTab(tabbar, resource_type) {
+        const self = this;
+        tabbar.append('button')
+            .attr('class', 'okit-tab')
+            .attr('id', this.generateTabId(resource_type))
+            .attr('type', 'button')
+            .text(this.generateTabName(resource_type))
+            .on('click', function () {
+                $('#tabular_view_tab_bar > button').removeClass("okit-tab-active");
+                $(jqId(self.generateTabId(resource_type))).addClass("okit-tab-active");
+                self.loadTabContent(resource_type);
+            });
+        $('#tabular_view_tab_bar button:first-child').trigger("click");
+    }
+
+    generateTabId(name) {
+        return `${name}_tab`;
+    }
+
+    generateTabName(name) {
+        return titleCase(name.replaceAll('_', ' '));
+    }
+
+    loadTabContent(resource_type) {
+        // Merge Property Maps
+        const property_map = {...this.resource_property_map['common'], ...this.resource_property_map[resource_type]}
+        const contents_div = d3.select(d3Id('tabular_view_tab_contents'));
+        // Empty existing Canvas
+        contents_div.selectAll('*').remove();
+        // Build Table
+        const table = contents_div.append('div').attr('class', 'table okit-table');
+        // Add Header
+        this.addTableHeader(table, property_map, resource_type);
+        // Add Body
+        this.addTableBody(table, property_map, resource_type);
+    }
+
+    addTableHeader(table, property_map, resource_type) {
+        // Table Header
+        const thead = table.append('div').attr('class', 'thead');
+        const tr = thead.append('div').attr('class', 'tr');
+        Object.entries(property_map).forEach(([key, value]) => {
+            tr.append('div').attr('class', 'th').text(key);
+        });
+    }
+
+    addTableBody(table, property_map, resource_type) {
+        const self = this;
+        // Table Body
+        const tbody = table.append('div').attr('class', 'tbody okit-tbody-alternating-colours');
+        let first = true;
+        for (let resource of this.okitjson[resource_type]) {
+            // Designer View Object
+            const view_resource = this.getViewResource(resource.getArtifactReference(), resource.id);
+            const tr = tbody.append('div').attr('class', 'tr').on('click', function() {view_resource.loadSlidePanels()});
+            if (first) {first = false; view_resource.loadSlidePanels();}
+            Object.entries(property_map).forEach(([key, value]) => {
+                let cell_data = '';
+                if (value.lookup) {
+                    if (Array.isArray(resource[value.property])) {
+                        const array_data = resource[value.property].map(id => self.getResource(value.lookup, id).display_name);
+                        cell_data = array_data.join(', ');
+                    } else {
+                        const lookup = this.getResource(value.lookup, resource[value.property]);
+                        if (lookup) {
+                            cell_data = lookup.display_name;
+                        } else {
+                            cell_data = '';
+                        }
+                    }
+                } else {
+                    cell_data = this.getValue(resource, value.property);
+                }
+                tr.append('div').attr('class', 'td').text(cell_data);
+            });
+        }
+    }
+
+    getResource(lookup, id) {
+        const sections = lookup.split('.');
+        const obj = sections[0];
+        const getFunction = sections[1];
+        return this[obj][getFunction](id);
+    }
+
+    getViewResource(type, id) {
+        const getFunction = `get${type.split(' ').join('')}`;
+        return okitJsonView[getFunction](id);
+    }
+
+    getValue(resource, key) {
+        const keys = key.split('.');
+        if (keys.length > 1) {
+            return this.getValue(resource[keys[0]], keys.slice(1).join('.'));
+        } else {
+            return resource[key];
+        }
+    }
+
+
+}
+
+let okitTabularView = null;
diff --git a/okitweb/static/okit/view/tree/css/okit_tree_view.css b/okitweb/static/okit/view/tree/css/okit_tree_view.css
index aa4356784..e52b65b09 100644
--- a/okitweb/static/okit/view/tree/css/okit_tree_view.css
+++ b/okitweb/static/okit/view/tree/css/okit_tree_view.css
@@ -1,5 +1,5 @@
 /*
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 
diff --git a/okitweb/static/okit/view/tree/js/okit_tree_view.js b/okitweb/static/okit/view/tree/js/okit_tree_view.js
index 32265323d..83f411de9 100644
--- a/okitweb/static/okit/view/tree/js/okit_tree_view.js
+++ b/okitweb/static/okit/view/tree/js/okit_tree_view.js
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded OKIT Tree View Javascript');
diff --git a/okitweb/static/svg/refresh.svg b/okitweb/static/svg/refresh.svg
new file mode 100644
index 000000000..ee53b22d0
--- /dev/null
+++ b/okitweb/static/svg/refresh.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+     y="0px"
+     viewBox="0 0 473.677 473.677" style="enable-background:new 0 0 473.677 473.677;" xml:space="preserve">
+<g>
+<path fill="#312D2A" d="M370.457,138.893c-33.97-48.633-89.75-76.478-149.366-69.65C163.73,75.81,117.43,112.9,94.45,164.42
+	c-9.839-0.026-19.674-0.049-29.513-0.075c-5.187-0.011-9.016,5.991-6.099,10.564c17.243,27.052,34.49,54.108,51.733,81.16
+	c2.909,4.57,9.218,4.458,12.12-0.045c17.378-26.966,34.759-53.936,52.141-80.902c1.877-2.913,1.245-5.729-0.512-7.674
+	c-1.096-1.657-2.913-2.838-5.512-2.846c-9.151-0.022-18.301-0.045-27.452-0.067c42.216-67.088,144.695-73.21,192.801-4.338
+	C349.572,182.254,386.029,161.189,370.457,138.893z"/>
+    <path fill="#312D2A" d="M414.449,297.545c-17.243-27.052-34.494-54.108-51.741-81.16c-2.909-4.57-9.218-4.458-12.12,0.045
+	c-17.374,26.966-34.756,53.936-52.133,80.902c-1.881,2.917-1.245,5.733,0.52,7.681c1.092,1.653,2.909,2.831,5.505,2.838
+	c9.151,0.022,18.301,0.045,27.448,0.067c-42.22,67.08-144.695,73.228-192.797,4.342c-15.407-22.06-51.86-0.995-36.293,21.304
+	c33.963,48.633,89.746,76.474,149.359,69.65c57.361-6.57,103.657-43.663,126.644-95.18c9.835,0.026,19.674,0.049,29.513,0.075
+	C413.537,308.124,417.366,302.118,414.449,297.545z"/>
+</g>
+</svg>
diff --git a/okitweb/templates/okit/okit_console.html b/okitweb/templates/okit/okit_console.html
index bd3d98a65..a17379eb8 100644
--- a/okitweb/templates/okit/okit_console.html
+++ b/okitweb/templates/okit/okit_console.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <!DOCTYPE html>
@@ -10,10 +10,12 @@
     <script type="text/javascript" src="{{ url_for('static', filename='js/d3-5.15.0.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/jquery-3.4.1.js') }}"></script>
     <script type="text/javascript">const developer_mode = {{ developer_mode | lower }};</script>
-    <!--script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_mode.js') }}"></script-->
     <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_common.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_console.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/model/js/okit_model.js') }}"></script>
+    {% if use_modules is defined %}
+    <script type="module" src="{{ url_for('static', filename='okit/modules/model/okit_model.js') }}"></script>
+    {% endif %}
     {% block headscripts %}{% endblock %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='okit/css/okit_console.css') }}">
     {% block headcss %}{% endblock %}
@@ -58,7 +60,7 @@
             <div class="okit-version-div"><label id="okit_version">Version</label></div>
             <div class="okit-update-div"><a id="okit_update" href="#" target="_blank" rel="noopener noreferrer"></a></div>
             <div>{% block footerblock %}{% endblock %}</div>
-            <div class="okit-copyright">Copyright (c) 2020, Oracle and/or its affiliates.</div>
+            <div class="okit-copyright">Copyright (c) 2021, Oracle and/or its affiliates.</div>
         </div>
     </div>
     <div id="modal_dialog_wrapper" class="okit-modal-wrapper hidden">
diff --git a/okitweb/templates/okit/okit_designer.html b/okitweb/templates/okit/okit_designer.html
index 597e6559a..3f622b9c3 100644
--- a/okitweb/templates/okit/okit_designer.html
+++ b/okitweb/templates/okit/okit_designer.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/okit_console.html" %}
@@ -36,9 +36,11 @@
     <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/view/js/okit_view.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/view/designer/js/okit_designer_view.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='okit/view/tabular/js/okit_tabular_view.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/view/tree/js/okit_tree_view.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/query/oci/js/okit_query.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_designer.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_view_layout.js') }}"></script>
     <script type="text/javascript">
         let palette_svg = {}
         let xmlSerialiser = new XMLSerializer();
@@ -140,7 +142,7 @@
             {% endfor %}
             <li><a id="loadfromgit-oci-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleLoadFromGIT()">GIT</a></li>
         </ul>
-        <!--ul class="okit-navigation-sub-list">
+        <ul class="okit-navigation-sub-list">
             <li>
                 <div>
                     <span class="header-item">
@@ -149,10 +151,9 @@
                     </span>
                 </div>
             </li>
-            <li><a id="view-compartment-menu-item" class="parent-item" href="javascript:void(0)">Compartment</a></li>
-            <li><a id="view-network-menu-item"  class="parent-item" href="javascript:void(0)">Network</a></li>
-            <li><a id="okit_view-security-menu-item" class="parent-item" href="javascript:void(0)">Security</a></li>
-        </ul-->
+            <li><a id="view-compartment-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleSwitchToCompartmentView()">Designer</a></li>
+            <li><a id="view-tabular-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleSwitchToTabularView()">Tabular</a></li>
+        </ul>
         <ul class="okit-navigation-sub-list">
             <li>
                 <div>
@@ -208,11 +209,23 @@
                 </div>
             </li>
             <li><a id="import-hcl-json-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleImportFromHCLJson()">Terraform Json</a></li>
-            {% if experimental_mode %}
-            <li><a id="import-cce-json-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleImportFromCCEJson()">Cost Estimator Json</a></li>
-            <li><a id="import-cd3-xlsx-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleImportFromCd3Xlsx()">CD3 Excel</a></li>
-            {% endif %}
         </ul>
+        {% if experimental_mode %}
+        <ul class="okit-navigation-sub-list">
+            <li>
+                <div>
+                    <span class="header-item">
+                        <div class="header-item-icon"><img src="{{ url_for('static', filename='svg/governance.svg') }}" alt="Experiment Menu"></div>
+                        <span>Experimental</span>
+                    </span>
+                </div>
+            </li>
+            <li><a id="import-cce-json-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleImportFromCCEJson()">Cost Estimator Json (Import)</a></li>
+            <li><a id="import-cd3-xlsx-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleImportFromCd3Xlsx()">CD3 Excel (Import)</a></li>
+            <li><a id="view-network-menu-item"  class="parent-item" href="javascript:void(0)" onclick="handleSwitchToNetworkView()">Network (View)</a></li>
+            <li><a id="view-security-menu-item" class="parent-item" href="javascript:void(0)" onclick="handleSwitchToSecurityView()">Security (View)</a></li>
+        </ul>
+        {% endif %}
     </ul>
 {% endblock %}
 
@@ -274,7 +287,9 @@
             <!--div class="td"><div class="td"><label>Description</label></div><div class="td"><input id="json_description" type="text" size="100" onchange="updateJsonDescription()"/></div></div-->
         </div>
         <div id="canvas-div" class="okit-svg-canvas"></div>
-        <div id="tabular-div" class="okit-svg-canvas hidden"></div>
+        <div id="tabular-div" class="okit-tabular-canvas hidden"></div>
+        <div id="network-div" class="okit-tabular-canvas hidden"></div>
+        <div id="security-div" class="okit-tabular-canvas hidden"></div>
     </div>
     <div id="designer_right_column" class="okit-designer-right-column okit-slide-hide-right">
         <div id="right_column_dragbar" class="okit-vertical-drag-bar hidden"></div>
diff --git a/okitweb/templates/okit/propertysheets/autonomous_database.html b/okitweb/templates/okit/propertysheets/autonomous_database.html
index 7601eaee9..f536a9d6d 100644
--- a/okitweb/templates/okit/propertysheets/autonomous_database.html
+++ b/okitweb/templates/okit/propertysheets/autonomous_database.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/base_property_sheet.html b/okitweb/templates/okit/propertysheets/base_property_sheet.html
index 5f85439d1..eec336a0b 100644
--- a/okitweb/templates/okit/propertysheets/base_property_sheet.html
+++ b/okitweb/templates/okit/propertysheets/base_property_sheet.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% macro properties_input(title, name, type='text', collapsed=False, readonly=False, row_id=undefined) -%}
diff --git a/okitweb/templates/okit/propertysheets/block_storage_volume.html b/okitweb/templates/okit/propertysheets/block_storage_volume.html
index 091cf9e59..7a76d61c2 100644
--- a/okitweb/templates/okit/propertysheets/block_storage_volume.html
+++ b/okitweb/templates/okit/propertysheets/block_storage_volume.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/compartment.html b/okitweb/templates/okit/propertysheets/compartment.html
index 1bd687a64..428e39f16 100644
--- a/okitweb/templates/okit/propertysheets/compartment.html
+++ b/okitweb/templates/okit/propertysheets/compartment.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/customer_premise_equipment.html b/okitweb/templates/okit/propertysheets/customer_premise_equipment.html
index 8c2a553e7..b12872f0b 100644
--- a/okitweb/templates/okit/propertysheets/customer_premise_equipment.html
+++ b/okitweb/templates/okit/propertysheets/customer_premise_equipment.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/database_system.html b/okitweb/templates/okit/propertysheets/database_system.html
index 6f69061f4..87ca7a69e 100644
--- a/okitweb/templates/okit/propertysheets/database_system.html
+++ b/okitweb/templates/okit/propertysheets/database_system.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/dynamic_routing_gateway.html b/okitweb/templates/okit/propertysheets/dynamic_routing_gateway.html
index e7c92680d..23d6dc931 100644
--- a/okitweb/templates/okit/propertysheets/dynamic_routing_gateway.html
+++ b/okitweb/templates/okit/propertysheets/dynamic_routing_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/empty.html b/okitweb/templates/okit/propertysheets/empty.html
index 758647402..1359ae76f 100644
--- a/okitweb/templates/okit/propertysheets/empty.html
+++ b/okitweb/templates/okit/propertysheets/empty.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <!DOCTYPE html>
diff --git a/okitweb/templates/okit/propertysheets/fast_connect.html b/okitweb/templates/okit/propertysheets/fast_connect.html
index 41ef368ae..f1d1e1540 100644
--- a/okitweb/templates/okit/propertysheets/fast_connect.html
+++ b/okitweb/templates/okit/propertysheets/fast_connect.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/file_storage_system.html b/okitweb/templates/okit/propertysheets/file_storage_system.html
index 6ad2b64bc..d03355d5c 100644
--- a/okitweb/templates/okit/propertysheets/file_storage_system.html
+++ b/okitweb/templates/okit/propertysheets/file_storage_system.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/instance.html b/okitweb/templates/okit/propertysheets/instance.html
index e2ab6bb9f..9aa4eae61 100644
--- a/okitweb/templates/okit/propertysheets/instance.html
+++ b/okitweb/templates/okit/propertysheets/instance.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/instance_pool.html b/okitweb/templates/okit/propertysheets/instance_pool.html
index 77a800c17..881a5fad6 100644
--- a/okitweb/templates/okit/propertysheets/instance_pool.html
+++ b/okitweb/templates/okit/propertysheets/instance_pool.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/internet_gateway.html b/okitweb/templates/okit/propertysheets/internet_gateway.html
index 5a9be6512..e1b1b93fc 100644
--- a/okitweb/templates/okit/propertysheets/internet_gateway.html
+++ b/okitweb/templates/okit/propertysheets/internet_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/ipsec_connection.html b/okitweb/templates/okit/propertysheets/ipsec_connection.html
index ee79c0c8e..524323b6f 100644
--- a/okitweb/templates/okit/propertysheets/ipsec_connection.html
+++ b/okitweb/templates/okit/propertysheets/ipsec_connection.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/load_balancer.html b/okitweb/templates/okit/propertysheets/load_balancer.html
index 51eb06e35..d8340a167 100644
--- a/okitweb/templates/okit/propertysheets/load_balancer.html
+++ b/okitweb/templates/okit/propertysheets/load_balancer.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/local_peering_gateway.html b/okitweb/templates/okit/propertysheets/local_peering_gateway.html
index 28e7c91c9..16132f566 100644
--- a/okitweb/templates/okit/propertysheets/local_peering_gateway.html
+++ b/okitweb/templates/okit/propertysheets/local_peering_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/mysql_database_system.html b/okitweb/templates/okit/propertysheets/mysql_database_system.html
index bf901e261..9899b057b 100644
--- a/okitweb/templates/okit/propertysheets/mysql_database_system.html
+++ b/okitweb/templates/okit/propertysheets/mysql_database_system.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/nat_gateway.html b/okitweb/templates/okit/propertysheets/nat_gateway.html
index 7c4962a19..72212b7b1 100644
--- a/okitweb/templates/okit/propertysheets/nat_gateway.html
+++ b/okitweb/templates/okit/propertysheets/nat_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/network_security_group.html b/okitweb/templates/okit/propertysheets/network_security_group.html
index c3f9940b3..e1859f2af 100644
--- a/okitweb/templates/okit/propertysheets/network_security_group.html
+++ b/okitweb/templates/okit/propertysheets/network_security_group.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/object_storage_bucket.html b/okitweb/templates/okit/propertysheets/object_storage_bucket.html
index 5efa43ec3..305c1af29 100644
--- a/okitweb/templates/okit/propertysheets/object_storage_bucket.html
+++ b/okitweb/templates/okit/propertysheets/object_storage_bucket.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/oke_cluster.html b/okitweb/templates/okit/propertysheets/oke_cluster.html
index f8489f9f2..9fb62d3a8 100644
--- a/okitweb/templates/okit/propertysheets/oke_cluster.html
+++ b/okitweb/templates/okit/propertysheets/oke_cluster.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/remote_peering_connection.html b/okitweb/templates/okit/propertysheets/remote_peering_connection.html
index 6e6b82d88..c99e0f0cc 100644
--- a/okitweb/templates/okit/propertysheets/remote_peering_connection.html
+++ b/okitweb/templates/okit/propertysheets/remote_peering_connection.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/route_table.html b/okitweb/templates/okit/propertysheets/route_table.html
index 2ece18205..46a53a631 100644
--- a/okitweb/templates/okit/propertysheets/route_table.html
+++ b/okitweb/templates/okit/propertysheets/route_table.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/security_list.html b/okitweb/templates/okit/propertysheets/security_list.html
index 9fc7a3552..7094d9c96 100644
--- a/okitweb/templates/okit/propertysheets/security_list.html
+++ b/okitweb/templates/okit/propertysheets/security_list.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/service_gateway.html b/okitweb/templates/okit/propertysheets/service_gateway.html
index b9fe5f8f0..5a74d90c4 100644
--- a/okitweb/templates/okit/propertysheets/service_gateway.html
+++ b/okitweb/templates/okit/propertysheets/service_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/settings.html b/okitweb/templates/okit/propertysheets/settings.html
index 2f167d048..f0565d6c6 100644
--- a/okitweb/templates/okit/propertysheets/settings.html
+++ b/okitweb/templates/okit/propertysheets/settings.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <!DOCTYPE html>
diff --git a/okitweb/templates/okit/propertysheets/subnet.html b/okitweb/templates/okit/propertysheets/subnet.html
index 8bba1509b..bb2137461 100644
--- a/okitweb/templates/okit/propertysheets/subnet.html
+++ b/okitweb/templates/okit/propertysheets/subnet.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -7,7 +7,7 @@
 {% block title_block %}Subnet{% endblock %}
 
 {% block required_properties_table_rows_block %}
-    <div class='tr'><div class='td'>Virtual Cloud Network</div><div class='td'><label id="vcn_id" class="okit-property-value okit-property-label"></label></div></div>
+    {{ properties_input('Virtual Cloud Network', 'vcn_id', type='select') }}
     <div class='tr'><div class='td'>CIDR</div><div class='td'><input type="text" id="cidr_block" name="cidr_block" class="okit-property-value"></div></div>
 {% endblock %}
 
diff --git a/okitweb/templates/okit/propertysheets/virtual_cloud_network.html b/okitweb/templates/okit/propertysheets/virtual_cloud_network.html
index d524e85b9..d22050a88 100644
--- a/okitweb/templates/okit/propertysheets/virtual_cloud_network.html
+++ b/okitweb/templates/okit/propertysheets/virtual_cloud_network.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
diff --git a/okitweb/templates/okit/propertysheets/virtual_network_interface.html b/okitweb/templates/okit/propertysheets/virtual_network_interface.html
index f693bb654..e14691ce1 100644
--- a/okitweb/templates/okit/propertysheets/virtual_network_interface.html
+++ b/okitweb/templates/okit/propertysheets/virtual_network_interface.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/subnet.html" %}
diff --git a/okitweb/templates/okit/valueproposition/autonomous_database.html b/okitweb/templates/okit/valueproposition/autonomous_database.html
index 9f20a6388..11dc44b59 100644
--- a/okitweb/templates/okit/valueproposition/autonomous_database.html
+++ b/okitweb/templates/okit/valueproposition/autonomous_database.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/base_value_proposition.html" %}
diff --git a/okitweb/templates/okit/valueproposition/base_value_proposition.html b/okitweb/templates/okit/valueproposition/base_value_proposition.html
index fd1963911..5daeb3a68 100644
--- a/okitweb/templates/okit/valueproposition/base_value_proposition.html
+++ b/okitweb/templates/okit/valueproposition/base_value_proposition.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <!DOCTYPE html>
diff --git a/okitweb/templates/okit/valueproposition/block_storage_volume.html b/okitweb/templates/okit/valueproposition/block_storage_volume.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/block_storage_volume.html
+++ b/okitweb/templates/okit/valueproposition/block_storage_volume.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/compartment.html b/okitweb/templates/okit/valueproposition/compartment.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/compartment.html
+++ b/okitweb/templates/okit/valueproposition/compartment.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/customer_premise_equipment.html b/okitweb/templates/okit/valueproposition/customer_premise_equipment.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/customer_premise_equipment.html
+++ b/okitweb/templates/okit/valueproposition/customer_premise_equipment.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/database_system.html b/okitweb/templates/okit/valueproposition/database_system.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/database_system.html
+++ b/okitweb/templates/okit/valueproposition/database_system.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/dynamic_routing_gateway.html b/okitweb/templates/okit/valueproposition/dynamic_routing_gateway.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/dynamic_routing_gateway.html
+++ b/okitweb/templates/okit/valueproposition/dynamic_routing_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/fast_connect.html b/okitweb/templates/okit/valueproposition/fast_connect.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/fast_connect.html
+++ b/okitweb/templates/okit/valueproposition/fast_connect.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/file_storage_system.html b/okitweb/templates/okit/valueproposition/file_storage_system.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/file_storage_system.html
+++ b/okitweb/templates/okit/valueproposition/file_storage_system.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/instance.html b/okitweb/templates/okit/valueproposition/instance.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/instance.html
+++ b/okitweb/templates/okit/valueproposition/instance.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/instance_pool.html b/okitweb/templates/okit/valueproposition/instance_pool.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/instance_pool.html
+++ b/okitweb/templates/okit/valueproposition/instance_pool.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/internet_gateway.html b/okitweb/templates/okit/valueproposition/internet_gateway.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/internet_gateway.html
+++ b/okitweb/templates/okit/valueproposition/internet_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/ipsec_connection.html b/okitweb/templates/okit/valueproposition/ipsec_connection.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/ipsec_connection.html
+++ b/okitweb/templates/okit/valueproposition/ipsec_connection.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/load_balancer.html b/okitweb/templates/okit/valueproposition/load_balancer.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/load_balancer.html
+++ b/okitweb/templates/okit/valueproposition/load_balancer.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/local_peering_gateway.html b/okitweb/templates/okit/valueproposition/local_peering_gateway.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/local_peering_gateway.html
+++ b/okitweb/templates/okit/valueproposition/local_peering_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/mysql_database_system.html b/okitweb/templates/okit/valueproposition/mysql_database_system.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/mysql_database_system.html
+++ b/okitweb/templates/okit/valueproposition/mysql_database_system.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/nat_gateway.html b/okitweb/templates/okit/valueproposition/nat_gateway.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/nat_gateway.html
+++ b/okitweb/templates/okit/valueproposition/nat_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/network_security_group.html b/okitweb/templates/okit/valueproposition/network_security_group.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/network_security_group.html
+++ b/okitweb/templates/okit/valueproposition/network_security_group.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/object_storage_bucket.html b/okitweb/templates/okit/valueproposition/object_storage_bucket.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/object_storage_bucket.html
+++ b/okitweb/templates/okit/valueproposition/object_storage_bucket.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/oci.html b/okitweb/templates/okit/valueproposition/oci.html
index 468b47474..7ada90abe 100644
--- a/okitweb/templates/okit/valueproposition/oci.html
+++ b/okitweb/templates/okit/valueproposition/oci.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/base_value_proposition.html" %}
diff --git a/okitweb/templates/okit/valueproposition/oke_cluster.html b/okitweb/templates/okit/valueproposition/oke_cluster.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/oke_cluster.html
+++ b/okitweb/templates/okit/valueproposition/oke_cluster.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/remote_peering_connection.html b/okitweb/templates/okit/valueproposition/remote_peering_connection.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/remote_peering_connection.html
+++ b/okitweb/templates/okit/valueproposition/remote_peering_connection.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/route_table.html b/okitweb/templates/okit/valueproposition/route_table.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/route_table.html
+++ b/okitweb/templates/okit/valueproposition/route_table.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/security_list.html b/okitweb/templates/okit/valueproposition/security_list.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/security_list.html
+++ b/okitweb/templates/okit/valueproposition/security_list.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/service_gateway.html b/okitweb/templates/okit/valueproposition/service_gateway.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/service_gateway.html
+++ b/okitweb/templates/okit/valueproposition/service_gateway.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/subnet.html b/okitweb/templates/okit/valueproposition/subnet.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/subnet.html
+++ b/okitweb/templates/okit/valueproposition/subnet.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/virtual_cloud_network.html b/okitweb/templates/okit/valueproposition/virtual_cloud_network.html
index 01c292df8..19c1ea1fd 100644
--- a/okitweb/templates/okit/valueproposition/virtual_cloud_network.html
+++ b/okitweb/templates/okit/valueproposition/virtual_cloud_network.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/virtual_network_interface.html b/okitweb/templates/okit/valueproposition/virtual_network_interface.html
index ea48a9192..0ffa6e9eb 100644
--- a/okitweb/templates/okit/valueproposition/virtual_network_interface.html
+++ b/okitweb/templates/okit/valueproposition/virtual_network_interface.html
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/valueproposition/subnet.html" %}
diff --git a/okitweb/wsgi.py b/okitweb/wsgi.py
index dacdc28d5..1c72c6ac4 100644
--- a/okitweb/wsgi.py
+++ b/okitweb/wsgi.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/requirements.txt b/requirements.txt
index 0176bd493..0df872c3b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+authlib==0.15.3
 flask==1.1.1
 gunicorn==20.0.4
 oci==2.22.0
diff --git a/skeletons/templates/artefact_facade.py.jinja2 b/skeletons/templates/artefact_facade.py.jinja2
index 5b15c5562..010286c54 100644
--- a/skeletons/templates/artefact_facade.py.jinja2
+++ b/skeletons/templates/artefact_facade.py.jinja2
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/skeletons/templates/artefact_model.js.jinja2 b/skeletons/templates/artefact_model.js.jinja2
index c2237722d..bfe46c8bb 100644
--- a/skeletons/templates/artefact_model.js.jinja2
+++ b/skeletons/templates/artefact_model.js.jinja2
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded {{ artefact_name }} Javascript');
diff --git a/skeletons/templates/artefact_properties.html.jinja2 b/skeletons/templates/artefact_properties.html.jinja2
index 592c30aa5..319466370 100644
--- a/skeletons/templates/artefact_properties.html.jinja2
+++ b/skeletons/templates/artefact_properties.html.jinja2
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {{ '{' }}% extends "okit/propertysheets/base_property_sheet.html" %{{ '}' }}
diff --git a/skeletons/templates/artefact_value_proposition.html.jinja2 b/skeletons/templates/artefact_value_proposition.html.jinja2
index 5ef2aef24..50eabe037 100644
--- a/skeletons/templates/artefact_value_proposition.html.jinja2
+++ b/skeletons/templates/artefact_value_proposition.html.jinja2
@@ -1,5 +1,5 @@
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {{ '{' }}% extends "okit/valueproposition/oci.html" %{{ '}' }}
diff --git a/skeletons/templates/artefact_view.js.jinja2 b/skeletons/templates/artefact_view.js.jinja2
index 87524c4b1..a215969c5 100644
--- a/skeletons/templates/artefact_view.js.jinja2
+++ b/skeletons/templates/artefact_view.js.jinja2
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded {{ artefact_name }} View Javascript');
@@ -127,7 +127,7 @@ OkitJsonView.prototype.move{{ model_class_name }} = function(id) {
         });
     $(jqId('modal_dialog_wrapper')).removeClass('hidden');
 }
-OkitJsonView.prototype.paste{{ model_class_name }}(drop_target) {
+OkitJsonView.prototype.paste{{ model_class_name }} = function(drop_target) {
     const clone = this.copied_artefact.artefact.clone();
     clone.display_name += 'Copy';
     if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
@@ -140,7 +140,7 @@ OkitJsonView.prototype.paste{{ model_class_name }}(drop_target) {
     this.okitjson.{{ artefact_json_list }}.push(clone);
     this.update(this.okitjson);
 }
-OkitJsonView.prototype.load{{ model_class_name }}sSelect(select_id, empty_option=false) {
+OkitJsonView.prototype.load{{ model_class_name }}sSelect = function(select_id, empty_option=false) {
     $(jqId(select_id)).empty();
     const {{ artefact_simple_name }}_select = $(jqId(select_id));
     if (empty_option) {
@@ -150,7 +150,7 @@ OkitJsonView.prototype.load{{ model_class_name }}sSelect(select_id, empty_option
         {{ artefact_simple_name }}_select.append($('<option>').attr('value', {{ artefact_simple_name }}.id).text({{ artefact_simple_name }}.display_name));
     }
 }
-OkitJsonView.prototype.load{{ model_class_name }}sMultiSelect(select_id) {
+OkitJsonView.prototype.load{{ model_class_name }}sMultiSelect = function(select_id) {
     $(jqId(select_id)).empty();
     const multi_select = d3.select(d3Id(select_id));
     for (let {{ artefact_simple_name }} of this.get{{ model_class_name }}s()) {
diff --git a/visualiser/common/__init__.py b/visualiser/common/__init__.py
index 6abc8e779..439c3c628 100644
--- a/visualiser/common/__init__.py
+++ b/visualiser/common/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
diff --git a/visualiser/common/ociQuery.py b/visualiser/common/ociQuery.py
index 0ad16ceb9..1ffaeedcf 100644
--- a/visualiser/common/ociQuery.py
+++ b/visualiser/common/ociQuery.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/common/okitCommon.py b/visualiser/common/okitCommon.py
index 62335b9ce..0d54d9cbe 100644
--- a/visualiser/common/okitCommon.py
+++ b/visualiser/common/okitCommon.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/common/okitExceptions.py b/visualiser/common/okitExceptions.py
index 33133e5ed..eb63b1c36 100644
--- a/visualiser/common/okitExceptions.py
+++ b/visualiser/common/okitExceptions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/common/okitLogging.py b/visualiser/common/okitLogging.py
index fc2108645..41581cdea 100644
--- a/visualiser/common/okitLogging.py
+++ b/visualiser/common/okitLogging.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/__init__.py b/visualiser/facades/__init__.py
index 9ef089220..0439f2aed 100644
--- a/visualiser/facades/__init__.py
+++ b/visualiser/facades/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociAutoScalingConfiguration.py b/visualiser/facades/ociAutoScalingConfiguration.py
index 3c1a0489d..3b96fdf7b 100644
--- a/visualiser/facades/ociAutoScalingConfiguration.py
+++ b/visualiser/facades/ociAutoScalingConfiguration.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociAutoScalingPolicies.py b/visualiser/facades/ociAutoScalingPolicies.py
index 9be30723b..e28af3dc1 100644
--- a/visualiser/facades/ociAutoScalingPolicies.py
+++ b/visualiser/facades/ociAutoScalingPolicies.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociAutonomousDatabases.py b/visualiser/facades/ociAutonomousDatabases.py
index 092a42caf..2e0a8503a 100644
--- a/visualiser/facades/ociAutonomousDatabases.py
+++ b/visualiser/facades/ociAutonomousDatabases.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociAvailabilityDomains.py b/visualiser/facades/ociAvailabilityDomains.py
index 3a9700e04..208220b12 100644
--- a/visualiser/facades/ociAvailabilityDomains.py
+++ b/visualiser/facades/ociAvailabilityDomains.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociBackend.py b/visualiser/facades/ociBackend.py
index 1313dd82e..738c38b25 100644
--- a/visualiser/facades/ociBackend.py
+++ b/visualiser/facades/ociBackend.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociBackendSet.py b/visualiser/facades/ociBackendSet.py
index 3b701c7a6..c6e8c6b0e 100644
--- a/visualiser/facades/ociBackendSet.py
+++ b/visualiser/facades/ociBackendSet.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociBlockStorageVolumes.py b/visualiser/facades/ociBlockStorageVolumes.py
index 279bcf9da..2a6edb0d8 100644
--- a/visualiser/facades/ociBlockStorageVolumes.py
+++ b/visualiser/facades/ociBlockStorageVolumes.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociBootVolumeAttachment.py b/visualiser/facades/ociBootVolumeAttachment.py
index f12cd99e1..a474972e9 100644
--- a/visualiser/facades/ociBootVolumeAttachment.py
+++ b/visualiser/facades/ociBootVolumeAttachment.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociBootVolumes.py b/visualiser/facades/ociBootVolumes.py
index f38935ee3..9befc2b02 100644
--- a/visualiser/facades/ociBootVolumes.py
+++ b/visualiser/facades/ociBootVolumes.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociCompartment.py b/visualiser/facades/ociCompartment.py
index ca8ca8d6d..236c0d1d5 100644
--- a/visualiser/facades/ociCompartment.py
+++ b/visualiser/facades/ociCompartment.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociConnection.py b/visualiser/facades/ociConnection.py
index 8f282690a..24ef22c03 100644
--- a/visualiser/facades/ociConnection.py
+++ b/visualiser/facades/ociConnection.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociContainer.py b/visualiser/facades/ociContainer.py
index 1898d9810..0fae779c6 100644
--- a/visualiser/facades/ociContainer.py
+++ b/visualiser/facades/ociContainer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociCpeDeviceShapes.py b/visualiser/facades/ociCpeDeviceShapes.py
index cae755658..f2dd3b8eb 100644
--- a/visualiser/facades/ociCpeDeviceShapes.py
+++ b/visualiser/facades/ociCpeDeviceShapes.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociCustomerPremiseEquipment.py b/visualiser/facades/ociCustomerPremiseEquipment.py
index 0cdf07e24..5e58cb73a 100644
--- a/visualiser/facades/ociCustomerPremiseEquipment.py
+++ b/visualiser/facades/ociCustomerPremiseEquipment.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociDatabaseSystem.py b/visualiser/facades/ociDatabaseSystem.py
index 3946bcdcf..cfb24f301 100644
--- a/visualiser/facades/ociDatabaseSystem.py
+++ b/visualiser/facades/ociDatabaseSystem.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociDatabaseSystemShape.py b/visualiser/facades/ociDatabaseSystemShape.py
index 4db0f93db..e7cfaf32a 100644
--- a/visualiser/facades/ociDatabaseSystemShape.py
+++ b/visualiser/facades/ociDatabaseSystemShape.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociDatabaseVersion.py b/visualiser/facades/ociDatabaseVersion.py
index e3dd882be..62357994d 100644
--- a/visualiser/facades/ociDatabaseVersion.py
+++ b/visualiser/facades/ociDatabaseVersion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociDynamicRoutingGateway.py b/visualiser/facades/ociDynamicRoutingGateway.py
index 32c6d7969..f532d5e51 100644
--- a/visualiser/facades/ociDynamicRoutingGateway.py
+++ b/visualiser/facades/ociDynamicRoutingGateway.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociDynamicRoutingGatewayAttachment.py b/visualiser/facades/ociDynamicRoutingGatewayAttachment.py
index cace1a85a..9b8bb9955 100644
--- a/visualiser/facades/ociDynamicRoutingGatewayAttachment.py
+++ b/visualiser/facades/ociDynamicRoutingGatewayAttachment.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociFastConnect.py b/visualiser/facades/ociFastConnect.py
index 7caae205e..04b967184 100644
--- a/visualiser/facades/ociFastConnect.py
+++ b/visualiser/facades/ociFastConnect.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociFastConnectProviderServices.py b/visualiser/facades/ociFastConnectProviderServices.py
index d45bf1b8a..0cea238a7 100644
--- a/visualiser/facades/ociFastConnectProviderServices.py
+++ b/visualiser/facades/ociFastConnectProviderServices.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociFileStorageSystems.py b/visualiser/facades/ociFileStorageSystems.py
index e619f15e4..7b2c2e38b 100644
--- a/visualiser/facades/ociFileStorageSystems.py
+++ b/visualiser/facades/ociFileStorageSystems.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociIPSecConnection.py b/visualiser/facades/ociIPSecConnection.py
index f92ae5ce8..bf2e2c936 100644
--- a/visualiser/facades/ociIPSecConnection.py
+++ b/visualiser/facades/ociIPSecConnection.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociImage.py b/visualiser/facades/ociImage.py
index 334626639..f0a7df8b0 100644
--- a/visualiser/facades/ociImage.py
+++ b/visualiser/facades/ociImage.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociInstance.py b/visualiser/facades/ociInstance.py
index 8c39b1167..734b75487 100644
--- a/visualiser/facades/ociInstance.py
+++ b/visualiser/facades/ociInstance.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociInstanceConfiguration.py b/visualiser/facades/ociInstanceConfiguration.py
index 279c87693..26d5e5fe7 100644
--- a/visualiser/facades/ociInstanceConfiguration.py
+++ b/visualiser/facades/ociInstanceConfiguration.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociInstancePool.py b/visualiser/facades/ociInstancePool.py
index 37e46aeee..71256911d 100644
--- a/visualiser/facades/ociInstancePool.py
+++ b/visualiser/facades/ociInstancePool.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociInternetGateway.py b/visualiser/facades/ociInternetGateway.py
index eeaf3624f..328ad8f4f 100644
--- a/visualiser/facades/ociInternetGateway.py
+++ b/visualiser/facades/ociInternetGateway.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociKubernetesVersion.py b/visualiser/facades/ociKubernetesVersion.py
index 82c14dfbd..5fecd5c69 100644
--- a/visualiser/facades/ociKubernetesVersion.py
+++ b/visualiser/facades/ociKubernetesVersion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociLoadBalancer.py b/visualiser/facades/ociLoadBalancer.py
index 032c852c9..2e037c721 100644
--- a/visualiser/facades/ociLoadBalancer.py
+++ b/visualiser/facades/ociLoadBalancer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociLoadBalancerHost.py b/visualiser/facades/ociLoadBalancerHost.py
index 7958e16aa..09750cdbc 100644
--- a/visualiser/facades/ociLoadBalancerHost.py
+++ b/visualiser/facades/ociLoadBalancerHost.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociLoadBalancerShape.py b/visualiser/facades/ociLoadBalancerShape.py
index 80bc46e8d..cbd36a1ee 100644
--- a/visualiser/facades/ociLoadBalancerShape.py
+++ b/visualiser/facades/ociLoadBalancerShape.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociLocalPeeringGateway.py b/visualiser/facades/ociLocalPeeringGateway.py
index b63695f4f..2c6c90d1a 100644
--- a/visualiser/facades/ociLocalPeeringGateway.py
+++ b/visualiser/facades/ociLocalPeeringGateway.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociMySQLConfiguration.py b/visualiser/facades/ociMySQLConfiguration.py
index 168aa50cf..0ef140d78 100644
--- a/visualiser/facades/ociMySQLConfiguration.py
+++ b/visualiser/facades/ociMySQLConfiguration.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociMySQLDatabaseSystem.py b/visualiser/facades/ociMySQLDatabaseSystem.py
index 252cc5a64..f362792a3 100644
--- a/visualiser/facades/ociMySQLDatabaseSystem.py
+++ b/visualiser/facades/ociMySQLDatabaseSystem.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociMySQLShape.py b/visualiser/facades/ociMySQLShape.py
index 844320297..42abd0677 100644
--- a/visualiser/facades/ociMySQLShape.py
+++ b/visualiser/facades/ociMySQLShape.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociMySQLVersion.py b/visualiser/facades/ociMySQLVersion.py
index 76bf594b6..b82ce8026 100644
--- a/visualiser/facades/ociMySQLVersion.py
+++ b/visualiser/facades/ociMySQLVersion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociNATGateway.py b/visualiser/facades/ociNATGateway.py
index 0daa40b15..980e53251 100644
--- a/visualiser/facades/ociNATGateway.py
+++ b/visualiser/facades/ociNATGateway.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociNetworkSecurityGroup.py b/visualiser/facades/ociNetworkSecurityGroup.py
index bbe176fc2..a2931b4e9 100644
--- a/visualiser/facades/ociNetworkSecurityGroup.py
+++ b/visualiser/facades/ociNetworkSecurityGroup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociNodePool.py b/visualiser/facades/ociNodePool.py
index 2bac7eb31..e65b23a1c 100644
--- a/visualiser/facades/ociNodePool.py
+++ b/visualiser/facades/ociNodePool.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociObjectStorageBuckets.py b/visualiser/facades/ociObjectStorageBuckets.py
index 5009dc079..b0dc36600 100644
--- a/visualiser/facades/ociObjectStorageBuckets.py
+++ b/visualiser/facades/ociObjectStorageBuckets.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociPrivateIps.py b/visualiser/facades/ociPrivateIps.py
index d8ed5764c..68ce8a436 100644
--- a/visualiser/facades/ociPrivateIps.py
+++ b/visualiser/facades/ociPrivateIps.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociRegion.py b/visualiser/facades/ociRegion.py
index 15145ad85..d29471277 100644
--- a/visualiser/facades/ociRegion.py
+++ b/visualiser/facades/ociRegion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociRemotePeeringConnection.py b/visualiser/facades/ociRemotePeeringConnection.py
index 698691f2c..d50614d22 100644
--- a/visualiser/facades/ociRemotePeeringConnection.py
+++ b/visualiser/facades/ociRemotePeeringConnection.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociResourceManager.py b/visualiser/facades/ociResourceManager.py
index eeb4b97e7..0e129213b 100644
--- a/visualiser/facades/ociResourceManager.py
+++ b/visualiser/facades/ociResourceManager.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociRouteTable.py b/visualiser/facades/ociRouteTable.py
index eb3b43311..0aebe1349 100644
--- a/visualiser/facades/ociRouteTable.py
+++ b/visualiser/facades/ociRouteTable.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociSecurityList.py b/visualiser/facades/ociSecurityList.py
index 2feb61f9b..a81d9d579 100644
--- a/visualiser/facades/ociSecurityList.py
+++ b/visualiser/facades/ociSecurityList.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociServiceGateway.py b/visualiser/facades/ociServiceGateway.py
index 44aaafbc5..008a3c7d6 100644
--- a/visualiser/facades/ociServiceGateway.py
+++ b/visualiser/facades/ociServiceGateway.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociServices.py b/visualiser/facades/ociServices.py
index e2470d41b..b7cde0842 100644
--- a/visualiser/facades/ociServices.py
+++ b/visualiser/facades/ociServices.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociShape.py b/visualiser/facades/ociShape.py
index 107de8885..ee8f47304 100644
--- a/visualiser/facades/ociShape.py
+++ b/visualiser/facades/ociShape.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociSubnet.py b/visualiser/facades/ociSubnet.py
index f5c92e7e2..5397a1288 100644
--- a/visualiser/facades/ociSubnet.py
+++ b/visualiser/facades/ociSubnet.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociTenancy.py b/visualiser/facades/ociTenancy.py
index 7c1485c3c..d3cd68ae1 100644
--- a/visualiser/facades/ociTenancy.py
+++ b/visualiser/facades/ociTenancy.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociVirtualCircuit.py b/visualiser/facades/ociVirtualCircuit.py
index c39bd7c80..9f048ab75 100644
--- a/visualiser/facades/ociVirtualCircuit.py
+++ b/visualiser/facades/ociVirtualCircuit.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociVirtualCircuitBandwidthShape.py b/visualiser/facades/ociVirtualCircuitBandwidthShape.py
index 58f3808cf..c854344c0 100644
--- a/visualiser/facades/ociVirtualCircuitBandwidthShape.py
+++ b/visualiser/facades/ociVirtualCircuitBandwidthShape.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociVirtualCloudNetwork.py b/visualiser/facades/ociVirtualCloudNetwork.py
index 7f9c0bb33..135ea4413 100644
--- a/visualiser/facades/ociVirtualCloudNetwork.py
+++ b/visualiser/facades/ociVirtualCloudNetwork.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociVnic.py b/visualiser/facades/ociVnic.py
index 86dc8fdc3..d3644ea86 100644
--- a/visualiser/facades/ociVnic.py
+++ b/visualiser/facades/ociVnic.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociVnicAttachement.py b/visualiser/facades/ociVnicAttachement.py
index b74daacc0..98e82e295 100644
--- a/visualiser/facades/ociVnicAttachement.py
+++ b/visualiser/facades/ociVnicAttachement.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/facades/ociVolumeAttachment.py b/visualiser/facades/ociVolumeAttachment.py
index adc942358..6b525da20 100644
--- a/visualiser/facades/ociVolumeAttachment.py
+++ b/visualiser/facades/ociVolumeAttachment.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/generators/__init__.py b/visualiser/generators/__init__.py
index 6c01f8a6b..8d697fa9c 100644
--- a/visualiser/generators/__init__.py
+++ b/visualiser/generators/__init__.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
diff --git a/visualiser/generators/okitAnsibleGenerator.py b/visualiser/generators/okitAnsibleGenerator.py
index 1ebdeff51..f787dd9b0 100644
--- a/visualiser/generators/okitAnsibleGenerator.py
+++ b/visualiser/generators/okitAnsibleGenerator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/generators/okitGenerator.py b/visualiser/generators/okitGenerator.py
index 8ba8cf211..882907882 100644
--- a/visualiser/generators/okitGenerator.py
+++ b/visualiser/generators/okitGenerator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -7,7 +7,7 @@
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
 __author__ = "Andrew Hopkinson (Oracle Cloud Solutions A-Team)"
-__copyright__ = "Copyright (c) 2020, Oracle and/or its affiliates."
+__copyright__ = "Copyright (c) 2021, Oracle and/or its affiliates."
 __version__ = "1.0.0"
 __module__ = "ociGenerator"
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
@@ -317,30 +317,31 @@ def renderBlockStorageVolume(self, block_storage_volume):
         logger.debug(self.create_sequence[-1])
         return
 
-    def renderCompartment(self, compartment):
+    def renderCompartment(self, resource):
         # Reset Variables
         self.initialiseJinja2Variables()
+        display_name = resource.get("display_name", resource.get("name", "Unknown"))
         # Read Data
-        standardisedName = self.standardiseResourceName(compartment['name'])
+        standardisedName = self.standardiseResourceName(display_name)
         resourceName = '{0:s}'.format(standardisedName)
         self.jinja2_variables['resource_name'] = resourceName
-        self.jinja2_variables['output_name'] = compartment['name']
+        self.jinja2_variables['output_name'] = display_name
         # Process Virtual Cloud Networks Data
         logger.info('Processing Compartment Information {0!s:s}'.format(standardisedName))
         # -- Define Variables
         # --- Required
         # ---- Root Compartment
-        self.jinja2_variables["root_compartment"] = compartment["root_compartment"]
+        self.jinja2_variables["root_compartment"] = resource["root_compartment"]
         # ---- Parent Compartment Id
-        if not compartment["root_compartment"]:
-            self.jinja2_variables["compartment_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[compartment['compartment_id']]))
+        if not resource["root_compartment"]:
+            self.jinja2_variables["compartment_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[resource['compartment_id']]))
         # ---- Display Name
-        self.addJinja2Variable("display_name", compartment["name"], standardisedName)
+        self.addJinja2Variable("display_name", display_name, standardisedName)
         # ---- Description
-        self.addJinja2Variable("description", compartment.get("description", compartment["name"]), standardisedName)
+        self.addJinja2Variable("description", resource.get("description", display_name), standardisedName)
         # --- Optional
         # ---- Tags
-        self.renderTags(compartment)
+        self.renderTags(resource)
 
         # -- Render Template
         jinja2_template = self.jinja2_environment.get_template("compartment.jinja2")
@@ -1087,33 +1088,34 @@ def renderNetworkSecurityGroup(self, network_security_group):
         logger.debug(self.create_sequence[-1])
         return
 
-    def renderObjectStorageBucket(self, object_storage_bucket):
+    def renderObjectStorageBucket(self, resource):
         # Reset Variables
         self.initialiseJinja2Variables()
+        display_name = resource.get("display_name", resource.get("name", "Unknown"))
         # Read Data
-        standardisedName = self.standardiseResourceName(object_storage_bucket['display_name'])
+        standardisedName = self.standardiseResourceName(display_name)
         resourceName = '{0:s}'.format(standardisedName)
         self.jinja2_variables['resource_name'] = resourceName
-        self.jinja2_variables['output_name'] = object_storage_bucket['display_name']
+        self.jinja2_variables['output_name'] = display_name
         # Process Object Storage Bucket Data
         logger.info('Processing Object Storage Bucket Information {0!s:s}'.format(standardisedName))
         # -- Define Variables
         # --- Required
         # ---- Compartment Id
-        self.jinja2_variables["compartment_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[object_storage_bucket['compartment_id']]))
+        self.jinja2_variables["compartment_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[resource['compartment_id']]))
         # ---- Display Name
-        self.addJinja2Variable("display_name", object_storage_bucket["display_name"], standardisedName)
+        self.addJinja2Variable("display_name", display_name, standardisedName)
         # ---- Namespace
-        self.addJinja2Variable("namespace", object_storage_bucket["namespace"], standardisedName)
+        self.addJinja2Variable("namespace", resource["namespace"], standardisedName)
         # ---- Name
-        self.addJinja2Variable("name", object_storage_bucket["name"], standardisedName)
+        self.addJinja2Variable("name", display_name, standardisedName)
         # ---- Storage Tier
-        self.addJinja2Variable("storage_tier", object_storage_bucket["storage_tier"], standardisedName)
+        self.addJinja2Variable("storage_tier", resource["storage_tier"], standardisedName)
         # ---- Public Access Type
-        self.addJinja2Variable("public_access_type", object_storage_bucket["public_access_type"], standardisedName)
+        self.addJinja2Variable("public_access_type", resource["public_access_type"], standardisedName)
         # --- Optional
         # ---- Tags
-        self.renderTags(object_storage_bucket)
+        self.renderTags(resource)
 
         # -- Render Template
         jinja2_template = self.jinja2_environment.get_template("object_storage_bucket.jinja2")
diff --git a/visualiser/generators/okitPythonGenerator.py b/visualiser/generators/okitPythonGenerator.py
index 113462086..e24aef0b6 100644
--- a/visualiser/generators/okitPythonGenerator.py
+++ b/visualiser/generators/okitPythonGenerator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/generators/okitResourceManagerGenerator.py b/visualiser/generators/okitResourceManagerGenerator.py
index 4a21645cd..4d0545e15 100644
--- a/visualiser/generators/okitResourceManagerGenerator.py
+++ b/visualiser/generators/okitResourceManagerGenerator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/generators/okitTerraform11Generator.py b/visualiser/generators/okitTerraform11Generator.py
index a431c1d82..4d7e11b2f 100644
--- a/visualiser/generators/okitTerraform11Generator.py
+++ b/visualiser/generators/okitTerraform11Generator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/generators/okitTerraformGenerator.py b/visualiser/generators/okitTerraformGenerator.py
index 25a0a2729..df727fb2c 100644
--- a/visualiser/generators/okitTerraformGenerator.py
+++ b/visualiser/generators/okitTerraformGenerator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/model/__init__.py b/visualiser/model/__init__.py
index 6abc8e779..439c3c628 100644
--- a/visualiser/model/__init__.py
+++ b/visualiser/model/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
diff --git a/visualiser/model/bom.py b/visualiser/model/bom.py
index df7d7f3d8..8a43328d0 100755
--- a/visualiser/model/bom.py
+++ b/visualiser/model/bom.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/model/calculator.py b/visualiser/model/calculator.py
index 853851b07..df54fe239 100755
--- a/visualiser/model/calculator.py
+++ b/visualiser/model/calculator.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/model/okitCostEstimator.py b/visualiser/model/okitCostEstimator.py
index 98c82e4be..3c6c46e42 100644
--- a/visualiser/model/okitCostEstimator.py
+++ b/visualiser/model/okitCostEstimator.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/model/okitValidation.py b/visualiser/model/okitValidation.py
index e7c1ba6da..166cf4bbb 100644
--- a/visualiser/model/okitValidation.py
+++ b/visualiser/model/okitValidation.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -332,6 +332,17 @@ def validateSubnets(self):
             vcn_cidr_map[vcn['id']] = vcn['cidr_block']
         for artefact in sorted(self.okit_json.get('subnets', []), key=lambda k: k['vcn_id']):
             logger.info('Validating {!s}'.format(artefact['display_name']))
+            # Check Connected to a VCN
+            if artefact['vcn_id'] == '':
+                self.valid = False
+                error = {
+                    'id': artefact['id'],
+                    'type': 'Subnet',
+                    'artefact': artefact['display_name'],
+                    'message': 'Subnet is not part of a VCN.',
+                    'element': 'vcn_id'
+                }
+                self.results['errors'].append(error)
             # Check that CIDR exists
             if artefact['cidr_block'] == '':
                 self.valid = False
diff --git a/visualiser/model/okit_price_v2.py b/visualiser/model/okit_price_v2.py
index e2d6474c6..16d9b4ea9 100755
--- a/visualiser/model/okit_price_v2.py
+++ b/visualiser/model/okit_price_v2.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -15,6 +15,7 @@
 import os
 from model import bom
 
+
 import numpy as np
 import pandas as pd
 from io import BytesIO
@@ -225,7 +226,7 @@ def price_calculator(okitjson, all_resources):
                     PAYG, Monthly_Flex = calculator.OCPU_per_hr(
                         dbaas_license_price, OCPU)
                     # Non-RAC VM - 456GB storage will be added
-                    dbaas_storage += dbaas['data_storage_size_in_gb'] + 456
+                    dbaas_storage = int(dbaas['data_storage_size_in_gb']) + 456
 
                     # parsing to bom format
                     bom.update_bom(df, base_dbaas_sku, OCPU, ocpu_per_month)
diff --git a/visualiser/model/shapes.py b/visualiser/model/shapes.py
index da0c61497..efdbb122f 100755
--- a/visualiser/model/shapes.py
+++ b/visualiser/model/shapes.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/model/streaming.py b/visualiser/model/streaming.py
index 862f5faa1..261189a31 100755
--- a/visualiser/model/streaming.py
+++ b/visualiser/model/streaming.py
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
diff --git a/visualiser/parsers/__init__.py b/visualiser/parsers/__init__.py
index 6abc8e779..439c3c628 100644
--- a/visualiser/parsers/__init__.py
+++ b/visualiser/parsers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
diff --git a/visualiser/parsers/OkitCd3ExcelParser.py b/visualiser/parsers/okitCd3ExcelParser.py
similarity index 51%
rename from visualiser/parsers/OkitCd3ExcelParser.py
rename to visualiser/parsers/okitCd3ExcelParser.py
index 4b8650375..fe6a406bf 100644
--- a/visualiser/parsers/OkitCd3ExcelParser.py
+++ b/visualiser/parsers/okitCd3ExcelParser.py
@@ -29,14 +29,23 @@ class OkitCd3ExcelParser(OkitParser):
     END = "<END>"
     ROOT_COMPARTMENT_ID = "cd3-root-comp"
     COMPARTMENT_SHEET = "Compartments"
-    VCN_SHEET = "VCNs"
-    SUBNET_SHEET = "Subnets"
     INSTANCE_SHEET = "Instances"
+    ROUTE_TABLE_SHEET = "RouteRulesinOCI"
+    SUBNET_SHEET = "Subnets"
+    VCN_SHEET = "VCNs"
+
+    DYNAMIC_ROUTING_GATEWAY = "dynamic_routing_gateways"
+    INTERNET_GATEWAY = "internet_gateways"
+    LOCAL_PEERING_GATEWAY = "local_peering_gateways"
+    NAT_GATEWAY = "nat_gateways"
+    SERVICE_GATEWAY = "service_gateways"
 
     def __init__(self, cd3_excel=None):
         self.cd3_excel = cd3_excel
         super(OkitCd3ExcelParser, self).__init__(None)
 
+    # Parse Excel Sheets
+
     def parse(self, cd3_excel=None):
         if cd3_excel is not None:
             self.cd3_excel = cd3_excel
@@ -52,8 +61,10 @@ def parse(self, cd3_excel=None):
             self.okit_json["compartments"][0]["id"] = self.ROOT_COMPARTMENT_ID
             self.parseCompartments(wb[self.COMPARTMENT_SHEET])
             self.parseVirtualCloudNetworks(wb[self.VCN_SHEET])
+            self.parseRouteTables(wb[self.ROUTE_TABLE_SHEET])
             self.parseSubnets(wb[self.SUBNET_SHEET])
-            logger.info(jsonToFormattedString(self.okit_json))
+            self.parseInstances(wb[self.INSTANCE_SHEET])
+            #logger.info(jsonToFormattedString(self.okit_json))
             result_json["okit_json"] = self.okit_json
             wb.close()
 
@@ -62,6 +73,114 @@ def parse(self, cd3_excel=None):
     def parseCompartments(self, sheet):
         return
 
+    def parseInstances(self, sheet):
+        row = 3
+        while not self.endRow(sheet, row):
+            # Destination cidr
+            col = "E"
+            resource = {
+                "compartment_id": self.getCompartmentId(sheet["B{0:d}".format(row)].value),
+                "availability_domain": sheet["C{0:d}".format(row)].value[-1],
+                "id": self.generateId("instance"),
+                "display_name": sheet["D{0:d}".format(row)].value,
+                "fault_domain": sheet["E{0:d}".format(row)].value,
+                "shape": sheet["J{0:d}".format(row)].value,
+                "vnics": [],
+                "source_details": {}
+            }
+            # VNICs
+            ## Subnet
+            col = "F"
+            vnic = {
+                "subnet_id": self.getSubnetId(sheet["{0:s}{1:d}".format(col, row)].value),
+                "hostname_labal": resource["display_name"].lower()
+            }
+            ## Public IP
+            col = "G"
+            #vnic["assign_public_ip"] = (sheet["{0:s}{1:d}".format(col, row)].value.lower() == 'true')
+            vnic["assign_public_ip"] = sheet["{0:s}{1:d}".format(col, row)].value
+            ## NSGs
+            resource["vnics"].append(vnic)
+            # Source details
+            col = "I"
+            source_details = sheet["{0:s}{1:d}".format(col, row)].value.split("::")
+            resource["source_details"]["source_type"] = source_details[0]
+            resource["source_details"]["os"] = source_details[-1]
+            # Add the Instance
+            self.okit_json["instances"].append(resource)
+            row += 1
+        return
+
+    def parseInternetGateways(self, sheet):
+        return
+
+    def parseRouteTables(self, sheet):
+        row = 3
+        while not self.endRow(sheet, row):
+            vcn_id = self.getVcnId(sheet["C{0:d}".format(row)].value)
+            name = sheet["D{0:d}".format(row)].value
+            resource = self.getRouteTable(name, vcn_id)
+            if resource is None:
+                resource = {
+                    "compartment_id": self.getCompartmentId(sheet["B{0:d}".format(row)].value),
+                    "vcn_id": vcn_id,
+                    "id": self.generateId("routetable"),
+                    "display_name": name,
+                    "route_rules": []
+                }
+                self.okit_json["route_tables"].append(resource)
+            # Add Rules
+            rule = {}
+            # Destination cidr
+            col = "E"
+            if sheet["{0:s}{1:d}".format(col, row)].value is not None and sheet["{0:s}{1:d}".format(col, row)].value.strip() != "":
+                rule["destination"] = "{0!s:s}".format(str(sheet["{0:s}{1:d}".format(col, row)].value))
+            # Destination Name
+            col = "F"
+            if sheet["{0:s}{1:d}".format(col, row)].value is not None :
+                destination = "{0!s:s}".format(str(sheet["{0:s}{1:d}".format(col, row)].value)).strip()
+            else:
+                destination = ""
+            # Target Type
+            col = "G"
+            if sheet["{0:s}{1:d}".format(col, row)].value is not None and sheet["{0:s}{1:d}".format(col, row)].value.strip() != "":
+                rule["target_type"] = "{0!s:s}s".format(str(sheet["{0:s}{1:d}".format(col, row)].value).replace(" ", "_")).lower()
+                if rule["target_type"] == self.INTERNET_GATEWAY:
+                    rule["network_entity_id"] = self.getInternetGatewayId(vcn_id)
+                elif rule["target_type"] == self.NAT_GATEWAY:
+                    rule["network_entity_id"] = self.getNatGatewayId(vcn_id)
+                elif rule["target_type"] == self.SERVICE_GATEWAY:
+                    rule["network_entity_id"] = self.getServiceGatewayId(vcn_id)
+                elif rule["target_type"] == self.LOCAL_PEERING_GATEWAY:
+                    rule["network_entity_id"] = self.getLocalPeeringGatewayId(destination)
+                elif rule["target_type"] == self.DYNAMIC_ROUTING_GATEWAY:
+                    rule["network_entity_id"] = self.getDynamicRoutingGatewayId(destination)
+            resource["route_rules"].append(rule)
+            # Increment row
+            row += 1
+        return
+
+    def parseSubnets(self, sheet):
+        row = 3
+        while not self.endRow(sheet, row):
+            subnet = {
+                "compartment_id": self.getCompartmentId(sheet["B{0:d}".format(row)].value),
+                "vcn_id": self.getVcnId(sheet["C{0:d}".format(row)].value),
+                "id": self.generateId("subnet"),
+                "display_name": sheet["D{0:d}".format(row)].value,
+                "cidr_block": sheet["E{0:d}".format(row)].value,
+                "prohibit_public_ip_on_vnic": sheet["E{0:d}".format(row)].value.strip().lower() == 'private',
+                "availability_domain": "0" if sheet["F{0:d}".format(row)].value.strip().lower() == 'regional' else sheet["F{0:d}".format(row)].value.strip()
+            }
+            # DNS Label
+            col = "Q"
+            if sheet["{0:s}{1:d}".format(col, row)].value is not None and sheet["{0:s}{1:d}".format(col, row)].value.strip() != "":
+                subnet["dns_label"] = sheet["{0:s}{1:d}".format(col, row)].value
+            # Add the Subnet
+            self.okit_json["subnets"].append(subnet)
+            row += 1
+        return
+
     def parseVirtualCloudNetworks(self, sheet):
         row = 3
         while sheet["A{0:d}".format(row)].value != self.END:
@@ -104,19 +223,47 @@ def parseVirtualCloudNetworks(self, sheet):
                 "{0:s}{1:d}".format(col, row)].value.strip().lower() != "n":
                 logger.info("Create Service Gateway")
                 self.createServiceGateway(vcn, sheet["{0:s}{1:d}".format(col, row)].value.strip())
+            # Local Peering Gateway
+            col = "J"
+            if sheet["{0:s}{1:d}".format(col, row)].value is not None:
+                hub_spoke = sheet["{0:s}{1:d}".format(col, row)].value.strip()
+            else:
+                hub_spoke = ""
+            col = "I"
+            if sheet["{0:s}{1:d}".format(col, row)].value is not None and sheet[
+                "{0:s}{1:d}".format(col, row)].value.strip() != '' and sheet[
+                "{0:s}{1:d}".format(col, row)].value.strip().lower() != "n":
+                logger.info("Create Local Peering Gateway")
+                self.createLocalPeeringGateway(vcn, sheet["{0:s}{1:d}".format(col, row)].value.strip(), hub_spoke)
             # Add the Virtual Cloud Network
             self.okit_json["virtual_cloud_networks"].append(vcn)
             row += 1
         return
 
-    def createNatGateway(self, vcn, name):
-        nat = {
-            "compartment_id": vcn["compartment_id"],
-            "id": self.generateId("natgateway"),
-            "vcn_id": vcn["id"],
-            "display_name": name if name.lower() != 'y' else "{0!s:s}_ng".format(vcn["display_name"])
-        }
-        self.okit_json["nat_gateways"].append(nat)
+    # Test Functions
+
+    def endRow(self, sheet, row):
+        testCells ="ABCDEFGHIJK"
+        if sheet["A{0:d}".format(row)].value == self.END:
+            return True
+        elif all(sheet["{0:s}{1:d}".format(c, row)].value is None or sheet["{0:s}{1:d}".format(c, row)].value.strip() == "" for c in testCells):
+            return True
+        else:
+            return False
+
+    # Create Resources
+
+    def createDynamicRoutingGateway(self, vcn, name):
+        if name.lower() == 'y':
+            name = "{0!s:s}_drg".format(vcn["display_name"])
+        for display_name in name.split(","):
+            gw = {
+                "compartment_id": vcn["compartment_id"],
+                "id": self.generateId("dynamicroutinggateway"),
+                "vcn_id": vcn["id"],
+                "display_name": display_name
+            }
+            self.okit_json["dynamic_routing_gateways"].append(gw)
         return
 
     def createInternetGateway(self, vcn, name):
@@ -129,53 +276,52 @@ def createInternetGateway(self, vcn, name):
         self.okit_json["internet_gateways"].append(ig)
         return
 
-    def createServiceGateway(self, vcn, name):
-        sg = {
+    def createLocalPeeringGateway(self, vcn, name, hub_spoke):
+        if name.lower() == 'y':
+            name = "{0!s:s}_lpg".format(vcn["display_name"])
+        for display_name in name.split(","):
+            gw = {
+                "compartment_id": vcn["compartment_id"],
+                "id": self.generateId("localpeeringgateway"),
+                "vcn_id": vcn["id"],
+                "display_name": display_name,
+                "peer_id": ""
+            }
+            if "spoke" in hub_spoke:
+                spoke = hub_spoke.split(":")
+                vcn_id = self.getVcnId(spoke[-1])
+                logger.info("{0:s} - {1!s:s}".format(hub_spoke, vcn_id))
+                for lpg in self.okit_json["local_peering_gateways"]:
+                    if lpg["vcn_id"] == vcn_id and lpg["peer_id"] == '':
+                        lpg["peer_id"] = gw["id"]
+                        gw["peer_id"] = lpg["id"]
+                        logger.info('Assigned {0:s}'.format(lpg["display_name"]))
+                        break;
+
+            self.okit_json["local_peering_gateways"].append(gw)
+        return
+
+    def createNatGateway(self, vcn, name):
+        nat = {
             "compartment_id": vcn["compartment_id"],
-            "id": self.generateId("servicegateway"),
+            "id": self.generateId("natgateway"),
             "vcn_id": vcn["id"],
-            "display_name": name if name.lower() != 'y' else "{0!s:s}_ig".format(vcn["display_name"])
+            "display_name": name if name.lower() != 'y' else "{0!s:s}_ng".format(vcn["display_name"])
         }
-        self.okit_json["service_gateways"].append(sg)
+        self.okit_json["nat_gateways"].append(nat)
         return
 
-    def createDynamicRoutingGateway(self, vcn, name):
-        sg = {
+    def createServiceGateway(self, vcn, name):
+        gw = {
             "compartment_id": vcn["compartment_id"],
-            "id": self.generateId("dynamicroutinggateway"),
+            "id": self.generateId("servicegateway"),
             "vcn_id": vcn["id"],
-            "display_name": name if name.lower() != 'y' else "{0!s:s}_ig".format(vcn["display_name"])
+            "display_name": name if name.lower() != 'y' else "{0!s:s}_sg".format(vcn["display_name"])
         }
-        self.okit_json["dynamic_routing_gateways"].append(sg)
-        return
-
-    def parseSubnets(self, sheet):
-        row = 3
-        while sheet["A{0:d}".format(row)].value != self.END:
-            subnet = {
-                "compartment_id": self.getCompartmentId(sheet["B{0:d}".format(row)].value),
-                "vcn_id": self.getVcnId(sheet["C{0:d}".format(row)].value),
-                "id": self.generateId("subnet"),
-                "display_name": sheet["D{0:d}".format(row)].value,
-                "cidr_block": sheet["E{0:d}".format(row)].value,
-                "prohibit_public_ip_on_vnic": sheet["E{0:d}".format(row)].value.strip().lower() == 'private',
-                "availability_domain": "0" if sheet["F{0:d}".format(row)].value.strip().lower() == 'regional' else sheet["F{0:d}".format(row)].value.strip()
-            }
-            # DNS Label
-            col = "Q"
-            if sheet["{0:s}{1:d}".format(col, row)].value is not None and sheet[
-                "{0:s}{1:d}".format(col, row)].value.strip() != "":
-                subnet["dns_label"] = sheet["{0:s}{1:d}".format(col, row)].value
-            # Add the Subnet
-            self.okit_json["subnets"].append(subnet)
-            row += 1
+        self.okit_json["service_gateways"].append(gw)
         return
 
-    def parseInternetGateways(self, sheet):
-        return
-
-    def parseInstances(self, sheet):
-        return
+    # Get Resource Ids
 
     def getCompartmentId(self, name):
         if not any(x["display_name"] == name for x in self.okit_json["compartments"]):
@@ -188,6 +334,28 @@ def getCompartmentId(self, name):
             self.okit_json["compartments"].append(compartment)
         return [x["id"] for x in self.okit_json["compartments"] if x["display_name"] == name][0]
 
+    def getDynamicRoutingGatewayId(self, name):
+        return [x["id"] for x in self.okit_json["dynamic_routing_gateways"] if x["display_name"] == name][0]
+
+    def getInternetGatewayId(self, vcn_id):
+        return [x["id"] for x in self.okit_json["internet_gateways"] if x["vcn_id"] == vcn_id][0]
+
+    def getLocalPeeringGatewayId(self, name):
+        return [x["id"] for x in self.okit_json["local_peering_gateways"] if x["display_name"] == name][0]
+
+    def getNatGatewayId(self, vcn_id):
+        return [x["id"] for x in self.okit_json["nat_gateways"] if x["vcn_id"] == vcn_id][0]
+
+    def getRouteTable(self, name, vcn_id):
+        resource = [x for x in self.okit_json["route_tables"] if x["display_name"] == name and x["vcn_id"] == vcn_id]
+        return resource[0] if len(resource) > 0 else None
+
+    def getServiceGatewayId(self, vcn_id):
+        return [x["id"] for x in self.okit_json["service_gateways"] if x["vcn_id"] == vcn_id][0]
+
+    def getSubnetId(self, name):
+        return [x["id"] for x in self.okit_json["subnets"] if x["display_name"] == name][0]
+
     def getVcnId(self, name):
         return [x["id"] for x in self.okit_json["virtual_cloud_networks"] if x["display_name"] == name][0]