Merge "Add CSIT tests for AAF Cert Service"
diff --git a/.gitattributes b/.gitattributes
index 6313b56..21a4e0a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 * text=auto eol=lf
+*.csar -text
diff --git a/INFO.yaml b/INFO.yaml
index e26c1f4..063dcf0 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -2,6 +2,7 @@
 project: 'integration-csit'
 project_creation_date: '2017-02-10'
 lifecycle_state: 'Incubation'
+project_category: ''
 project_lead: &onap_releng_ptl
     name: 'Morgan Richomme'
     email: 'morgan.richomme@orange.com'
@@ -13,16 +14,21 @@
     type: 'jira'
     url: 'https://jira.onap.org/projects/INT'
     key: 'INT'
+mailing_list:
+    type: 'groups.io'
+    url: 'lists.onap.org'
+    tag: '<[sub-project_name]>'
+realtime_discussion: ''
 meetings:
     - type: 'zoom'
-      agenda: 'https://wiki.onap.org/display/DW/Integration+Meeting+Minutes'
+      agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
       url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
       server: 'n/a'
       channel: 'n/a'
       repeats: 'weekly'
       time: '14:00 UTC'
 repositories:
-    - 'csit'
+    - 'integration/csit'
 committers:
     - <<: *onap_releng_ptl
     - name: 'Christophe Closset'
@@ -39,12 +45,12 @@
       email: 'fu.jinhua@zte.com.cn'
       company: 'ZTE'
       id: 'fujinhua'
-      timezone: 'China'
+      timezone: 'China/Beijing'
     - name: 'Catherine Lefevre'
       email: 'cl664y@att.com'
       company: 'AT&T'
       id: 'Katel34'
-      timezone: 'Belgium'
+      timezone: 'Belgium/Namur'
     - name: 'Marco Platania'
       email: 'platania@research.att.com'
       company: 'ATT'
@@ -55,11 +61,6 @@
       company: 'AT&T'
       id: 'bdfreeman1421'
       timezone: 'America/New York'
-    - name: 'Mariusz Wagner'
-      email: 'mariusz.wagner@nokia.com'
-      company: 'Nokia'
-      id: 'mwagner9'
-      timezone: 'Poland/Wroclaw'
     - name: 'Morgan Richomme'
       email: 'morgan.richomme@orange.com'
       company: 'orange'
@@ -68,12 +69,12 @@
     - name: 'Bartek Grzybowski'
       email: 'b.grzybowski@partner.samsung.com'
       company: 'samsung'
-      id: 'b.grzybowski'
+      id: 'bgrzybowski'
       timezone: 'Poland/Warsaw'
     - name: 'Marcin Przybysz'
       email: 'marcin.przybysz@nokia.com'
       company: 'nokia'
-      id: 'mprzybysz'
+      id: 'mprzybys'
       timezone: 'Poland/Warsaw'
     - name: 'Eric Multanen'
       email: 'eric.w.multanen@intel.com'
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
index 018f590..9461eee 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
@@ -5,8 +5,8 @@
   "server.maxPayloadSizeBytes": 1048576,
   "cbs.firstRequestDelaySec": 3,
   "cbs.requestIntervalSec": 5,
-  "security.keys.keyStoreFile": "/etc/hv-ves/ssl/server.p12",
-  "security.keys.keyStorePasswordFile": "/etc/hv-ves/ssl/server.pass",
-  "security.keys.trustStoreFile": "/etc/hv-ves/ssl/trust.p12",
-  "security.keys.trustStorePasswordFile": "/etc/hv-ves/ssl/trust.pass"
+  "security.keys.keyStoreFile": "/etc/ves-hv/ssl/server.p12",
+  "security.keys.keyStorePasswordFile": "/etc/ves-hv/ssl/server.pass",
+  "security.keys.trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
+  "security.keys.trustStorePasswordFile": "/etc/ves-hv/ssl/trust.pass"
 }
\ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
index 33e3b32..555590c 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
@@ -48,7 +48,7 @@
 
 function gen_ca() {
   local ca="$1"
-  keytool -genkeypair ${store_opts} -alias ${ca} -dname "${DNAME_PREFIX}-${ca}" -keystore ${ca}.p12
+  keytool -genkeypair ${store_opts} -alias ${ca} -dname "${DNAME_PREFIX}-${ca}" -keystore ${ca}.p12 -ext bc:c
   keytool -export -alias ${ca} -file ${ca}.crt ${store_opts} -keystore ${ca}.p12
 }
 
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 6f5f2ee..d89e82b 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -103,7 +103,7 @@
     ports:
       - "6060:6060"
       - "6061:6061/tcp"
-    command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"]
+    command: ["--configuration-file", "/etc/ves-hv/configuration/secure.json"]
     environment:
       - JAVA_OPTS
       - HOSTNAME=${HV_VES_HOSTNAME}
@@ -116,7 +116,7 @@
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./collector/:/etc/hv-ves/
+      - ./collector/:/etc/ves-hv/
     depends_on:
       - config-binding-service
       - kafka
@@ -128,7 +128,7 @@
     ports:
       - "7060:6060"
       - "7061:6061/tcp"
-    command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"]
+    command: ["--configuration-file", "/etc/ves-hv/configuration/insecure.json"]
     environment:
       - JAVA_OPTS
       - HOSTNAME=${HV_VES_HOSTNAME}
@@ -141,7 +141,7 @@
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./collector/:/etc/hv-ves/
+      - ./collector/:/etc/ves-hv/
     depends_on:
       - config-binding-service
       - kafka
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
index a93df5d..1bd0ba1 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
@@ -26,8 +26,8 @@
 export CONFIG_BINDING_SERVICE_SERVICE_PORT="10000"
 
 export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
-export DOCKER_REGISTRY="docker.io"
-export DOCKER_REGISTRY_PREFIX=""
+export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}
+export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
 
 export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6"
 export ZOOKEEPER_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/zookeeper:4.0.0"
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addFeed3.txt b/plans/dcaegen2-pmmapper/pmmapper/assets/addFeed3.txt
new file mode 100644
index 0000000..60544d9
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/addFeed3.txt
@@ -0,0 +1,44 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START==================================================
+# * org.onap.dmaap
+# * ===========================================================================
+# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# * ===========================================================================
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+#  *      http://www.apache.org/licenses/LICENSE-2.0
+# *
+#  * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# * ============LICENSE_END====================================================
+# *
+# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# *
+#-------------------------------------------------------------------------------
+{
+     "name": "Jettydemo",
+     "version": "m1.0",
+     "description": "Jettydemo",
+     "business_description": "Jettydemo",
+     "suspend": false,
+     "deleted": false,
+     "changeowner": true,
+     "authorization": {
+          "classification": "unclassified",
+          "endpoint_addrs": [
+               "<kafka-ip>",
+            ],
+          "endpoint_ids": [
+               {
+                    "password": "rs873m",
+                    "id": "rs873m"
+               }
+          ]
+     },
+}
+
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.txt b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.txt
new file mode 100644
index 0000000..95cc2af
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.txt
@@ -0,0 +1,35 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START==================================================
+# * org.onap.dmaap
+# * ===========================================================================
+# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# * ===========================================================================
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+#  *      http://www.apache.org/licenses/LICENSE-2.0
+# *
+#  * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# * ============LICENSE_END====================================================
+# *
+# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# *
+#-------------------------------------------------------------------------------
+{
+"delivery" :
+    {
+        "url" : "http://<kafka-ip>:7070/",
+        "user" : "datarouter",
+        "password" : "datarouter",
+        "use100" : true
+    },
+"metadataOnly" : false,
+"suspend" : false,
+"groupid" : 29,
+"subscriber" : "sg481n"
+}
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
index aacbb5b..4288287 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
@@ -1,9 +1,9 @@
 {
   "pm-mapper-filter": { "filters":[]},
-  "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
-  "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
-  "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
-  "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass",
+  "key_store_path": "/opt/app/pm-mapper/etc/certs/cert.jks.b64",
+  "key_store_pass_path": "/opt/app/pm-mapper/etc/certs/jks.pass",
+  "trust_store_path": "/opt/app/pm-mapper/etc/certs/trust.jks.b64",
+  "trust_store_pass_path": "/opt/app/pm-mapper/etc/certs/trust.pass",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "1",
   "aaf_identity": "aaf_admin@people.osaaf.org",
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/node.properties b/plans/dcaegen2-pmmapper/pmmapper/assets/node.properties
new file mode 100644
index 0000000..ddd4ebc
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/node.properties
@@ -0,0 +1,87 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START==================================================
+# * org.onap.dmaap
+# * ===========================================================================
+# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * ===========================================================================
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+#  *      http://www.apache.org/licenses/LICENSE-2.0
+# *
+#  * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# * ============LICENSE_END====================================================
+# *
+# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# *
+#-------------------------------------------------------------------------------
+#
+#    Configuration parameters set at startup for the DataRouter node
+#
+#    URL to retrieve dynamic configuration
+ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov
+#
+#    URL to upload PUB/DEL/EXP logs
+LogUploadURL = https://dmaap-dr-prov:8443/internal/logs
+#
+#    The port number for http as seen within the server
+IntHttpPort = 8080
+#
+#    The port number for https as seen within the server
+IntHttpsPort = 8443
+#
+#    The external port number for https taking port mapping into account
+ExtHttpsPort = 443
+#
+#    The minimum interval between fetches of the dynamic configuration from the provisioning server
+MinProvFetchInterval = 10000
+#
+#    The minimum interval between saves of the redirection data file
+MinRedirSaveInterval = 10000
+#
+#    The path to the directory where log files are stored
+LogDir = /opt/app/datartr/logs
+#
+#    The retention interval (in days) for log files
+LogRetention = 30
+#
+#    The path to the directories where data and meta data files are stored
+SpoolDir = /opt/app/datartr/spool
+#
+#    The path to the redirection data file
+RedirectionFile = etc/redirections.dat
+#
+#    The type of keystore for https
+KeyStoreType = PKCS12
+#
+#    The type of truststore for https
+TrustStoreType = jks
+#
+#    The path to the file used to trigger an orderly shutdown
+QuiesceFile = etc/SHUTDOWN
+#
+#    The key used to generate passwords for node to node transfers
+NodeAuthKey = Node123!
+#
+#    DR_NODE DEFAULT ENABLED TLS PROTOCOLS
+NodeHttpsProtocols = TLSv1.1|TLSv1.2
+#
+#    AAF type to generate permission string
+AAFType = org.onap.dmaap-dr.feed
+#
+#    AAF default instance to generate permission string - default should be legacy
+AAFInstance = legacy
+#
+#    AAF action to generate permission string - default should be publish
+AAFAction = publish
+#
+#    AAF CADI enabled flag
+CadiEnabled = false
+#
+#    AAF Props file path
+AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/provserver.properties b/plans/dcaegen2-pmmapper/pmmapper/assets/provserver.properties
new file mode 100644
index 0000000..20b5cb9
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/provserver.properties
@@ -0,0 +1,60 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START==================================================
+# * org.onap.dmaap
+# * ===========================================================================
+# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * ===========================================================================
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+#  *      http://www.apache.org/licenses/LICENSE-2.0
+# *
+#  * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# * ============LICENSE_END====================================================
+# *
+# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# *
+#-------------------------------------------------------------------------------
+
+#Jetty Server properties
+org.onap.dmaap.datarouter.provserver.http.port           = 8080
+org.onap.dmaap.datarouter.provserver.https.port          = 8443
+org.onap.dmaap.datarouter.provserver.https.relaxation    = true
+
+org.onap.dmaap.datarouter.provserver.aafprops.path       = /opt/app/osaaf/local/org.onap.dmaap-dr.props
+
+org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs
+org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool
+org.onap.dmaap.datarouter.provserver.dbscripts           = /opt/app/datartr/etc/misc
+org.onap.dmaap.datarouter.provserver.logretention        = 30
+
+#DMAAP-597 (Tech Dept) REST request source IP auth
+# relaxation to accommodate OOM kubernetes deploy
+org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
+
+#Localhost address config
+org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1
+
+# Database access
+org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
+org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://datarouter-mariadb:3306/datarouter
+org.onap.dmaap.datarouter.db.login    = datarouter
+org.onap.dmaap.datarouter.db.password = datarouter
+
+# PROV - DEFAULT ENABLED TLS PROTOCOLS
+org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2
+
+# AAF config
+org.onap.dmaap.datarouter.provserver.cadi.enabled = false
+
+org.onap.dmaap.datarouter.provserver.passwordencryption   = PasswordEncryptionKey#@$%^&1234#
+org.onap.dmaap.datarouter.provserver.aaf.feed.type        = org.onap.dmaap-dr.feed
+org.onap.dmaap.datarouter.provserver.aaf.sub.type         = org.onap.dmaap-dr.sub
+org.onap.dmaap.datarouter.provserver.aaf.instance         = legacy
+org.onap.dmaap.datarouter.provserver.aaf.action.publish   = publish
+org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml
deleted file mode 100644
index bf28b9f..0000000
--- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-version: '2.1'
-services:
-  datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov
-    container_name: datarouter-prov
-    hostname: dmaap-dr-prov
-    ports:
-     - "443:8443"
-     - "8443:8443"
-     - "8080:8080"
-    volumes:
-     - ../prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
-     - ../prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-     - ../prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
-    depends_on:
-      mariadb_container:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-    extra_hosts:
-      - "dmaap-dr-node:1.1.1.1"
-      - "dcae-pm-mapper:3.3.3.3"
-
-  datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
-    container_name: datarouter-node
-    hostname: dmaap-dr-node
-    ports:
-     - "9443:8443"
-     - "9090:8080"
-    volumes:
-     - ../node_data/node.properties:/opt/app/datartr/etc/node.properties
-    depends_on:
-      datarouter-prov:
-        condition: service_healthy
-    extra_hosts:
-      - "dmaap-dr-prov:2.2.2.2"
-      - "dcae-pm-mapper:3.3.3.3"
-
-  mariadb_container:
-    image: mariadb:10.2.14
-    container_name: mariadb
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_ROOT_PASSWORD: datarouter
-      MYSQL_DATABASE: datarouter
-      MYSQL_USER: datarouter
-      MYSQL_PASSWORD: datarouter
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]
-      interval: 10s
-      timeout: 30s
-      retries: 5
-
-  consul:
-    container_name: consul
-    image: nexus3.onap.org:10001/consul:latest
-
-  cbs:
-    container_name: cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
-    environment:
-       CONSUL_HOST:
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml b/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml
new file mode 100644
index 0000000..c9f3e9a
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml
@@ -0,0 +1,121 @@
+version: '3.3'
+
+services:
+  datarouter-prov:
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov
+    container_name: datarouter-prov
+    hostname: dmaap-dr-prov
+    ports:
+     - "443:8443"
+     - "8443:8443"
+     - "8080:8080"
+    volumes:
+     - /var/tmp/provserver.properties:/opt/app/datartr/etc/provserver.properties
+     - /var/tmp/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
+     - /var/tmp/addFeed3.txt:/opt/app/datartr/addFeed3.txt
+    depends_on:
+      - mariadb
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
+      interval: 10s
+      timeout: 10s
+      retries: 5
+    networks:
+      pmmapper-network:
+        ipv4_address: $DR_PROV_IP
+    extra_hosts:
+      - "dmaap-dr-node:$DR_NODE_IP"
+      - "dcae-pm-mapper:$PMMAPPER_IP"
+
+  datarouter-node:
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
+    container_name: datarouter-node
+    hostname: dmaap-dr-node
+    ports:
+     - "9443:8443"
+     - "9090:8080"
+    volumes:
+     - /var/tmp/node.properties:/opt/app/datartr/etc/node.properties
+    depends_on:
+      - datarouter-prov
+    networks:
+      pmmapper-network:
+        ipv4_address: $DR_NODE_IP
+    extra_hosts:
+      - "dmaap-dr-prov:$DR_PROV_IP"
+      - "dcae-pm-mapper:$PMMAPPER_IP"
+
+  node:
+    image: node:10-slim
+    container_name: mr-simulator
+    volumes:
+      - /var/tmp/mrserver.js:/tmp/mrserver.js
+    command:
+      nodejs /tmp/mrserver.js
+    networks:
+      pmmapper-network:
+        ipv4_address: $NODE_IP
+
+  mariadb:
+    image: mariadb:10.2.14
+    container_name: mariadb
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: datarouter
+      MYSQL_DATABASE: datarouter
+      MYSQL_USER: datarouter
+      MYSQL_PASSWORD: datarouter
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]
+      interval: 10s
+      timeout: 30s
+      retries: 5
+    networks:
+      pmmapper-network:
+        ipv4_address: $MARIADB_IP
+
+  consul:
+    container_name: consul
+    image: nexus3.onap.org:10001/consul:latest
+    networks:
+      pmmapper-network:
+        ipv4_address: $CONSUL_IP
+
+  cbs:
+    container_name: cbs
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
+    environment:
+       CONSUL_HOST: $CONSUL_IP
+    networks:
+      pmmapper-network:
+        ipv4_address: $CBS_IP
+
+  pmmapper:
+    container_name: pmmapper
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest
+    ports:
+     - "8081:8081"
+    volumes:
+      - /var/tmp/:/opt/app/pm-mapper/etc/certs/
+    depends_on:
+      - datarouter-prov
+    environment:
+       CONFIG_BINDING_SERVICE_SERVICE_HOST: $CBS_IP
+       CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
+       HOSTNAME: pmmapper
+    networks:
+      pmmapper-network:
+        ipv4_address: $PMMAPPER_IP
+    extra_hosts:
+      - "dmaap-dr-node:$DR_NODE_IP"
+      - "message-router:$NODE_IP"
+
+
+networks:
+  pmmapper-network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.18.0.0/16
+
diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
index 29b8d9c..247d24d 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh
+++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
@@ -2,136 +2,93 @@
 # Place the scripts in run order:
 source ${SCRIPTS}/common_functions.sh
 
-# Clone DMaaP Message Router repo
-mkdir -p $WORKSPACE/archives/dmaapmr
-cd $WORKSPACE/archives/dmaapmr
-git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master
-sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml
-cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose
-cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/
-
-# start DMaaP MR containers with docker compose and configuration from docker-compose.yml
 docker login -u docker -p docker nexus3.onap.org:10001
-docker-compose up -d
 
-ZOOKEEPER=$(docker ps -a -q --filter="name=zookeeper_1")
-KAFKA=$(docker ps -a -q --filter="name=kafka_1")
-DMAAP=$(docker ps -a -q --filter="name=dmaap_1")
+TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper
 
-# Get IP address of KAFKA, Zookeeper
-KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA)
-ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER)
+export GATEWAY_IP=172.18.0.1
+export DR_NODE_IP=172.18.0.2
+export DR_PROV_IP=172.18.0.3
+export CONSUL_IP=172.18.0.4
+export CBS_IP=172.18.0.5
+export MARIADB_IP=172.18.0.6
+export NODE_IP=172.18.0.7
+export PMMAPPER_IP=172.18.0.8
 
-# Shutdown DMAAP Container
-docker kill $DMAAP
+for asset in provserver.properties addSubscriber.txt addFeed3.txt node.properties cbs.json mrserver.js cert.jks.b64 jks.pass trust.jks.b64 trust.pass; do
+  cp $TEST_PLANS_DIR/assets/${asset} /var/tmp/
+done
 
-# Initial docker-compose up and down is for populating kafka and zookeeper IPs in /var/tmp/MsgRtrApi.properites
-sed -i -e '/config.zk.servers=/ s/=.*/='$ZOOKEEPER_IP'/' /var/tmp/MsgRtrApi.properties
-sed -i -e '/kafka.metadata.broker.list=/ s/=.*/='$KAFKA_IP':9092/' /var/tmp/MsgRtrApi.properties
+sed -i 's/datarouter-mariadb/'$MARIADB_IP'/g' /var/tmp/provserver.properties
+#sed -i 's/<kafka-ip>/'$KAFKA_IP'/g' /var/tmp/addSubscriber.txt
+#sed -i 's/<kafka-ip>/'$KAFKA_IP'/g' /var/tmp/addFeed3.txt
+#sed -i 's/ipaddress/'$CBS_IP'/g' /var/tmp/cbs.json
+sed -i 's/ipaddress//g' /var/tmp/cbs.json
 
-# Start DMaaP MR containers with docker compose and configuration from docker-compose.yml
-docker login -u docker -p docker nexus3.onap.org:10001
-docker-compose up -d
-sleep 5
+docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d mariadb consul cbs node
 
-# Get IP address of DMAAP Message Router.
-DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
+echo "Waiting for MariaDB to come up healthy..."
+for i in {1..30}; do
+    mariadb_state=$(docker inspect --format='{{json .State.Health.Status}}' mariadb)
+    if [ $mariadb_state = '"healthy"' ]
+    then
+      break
+    else
+      sleep 2
+    fi
+done
+[ "$mariadb_state" != '"healthy"' ] && echo "Error: MariaDB container state not healthy" && exit 1
 
-# Clone DMaaP Data Router repo and Initialization of Data Router, Consul, Config Binding Service
-mkdir -p $WORKSPACE/archives/dmaapdr
-cd $WORKSPACE/archives/dmaapdr
-git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources
-mkdir docker-compose
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml
-docker login -u docker -p docker nexus3.onap.org:10001
-docker-compose up -d
-echo "Disregard the message ERROR: for datarouter-node  Container 1234456 is unhealthy, this is expected behaiour at this stage"
-sleep 10
-docker kill cbs
-CONSUL_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' consul )
-sed -i -e '/CONSUL_HOST:/ s/:.*/: '$CONSUL_IP'/' docker-compose.yml
-MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mariadb )
-sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties
-docker-compose up -d
-DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov)
-DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
+docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d datarouter-node datarouter-prov
 
-# Consul Configuration for PM Mapper
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json /tmp/cbs.json
-sed -i 's/ipaddress/'${CBS_IP}'/g' /tmp/cbs.json
-curl --request PUT --data @/tmp/cbs.json http://$CONSUL_IP:8500/v1/agent/service/register
-curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+curl --request PUT --data @/var/tmp/cbs.json http://$CONSUL_IP:8500/v1/agent/service/register
+curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT \
+      -H 'Accept: application/json' \
+      -H 'Content-Type: application/json' \
+      -H 'X-Requested-With: XMLHttpRequest' \
+      --data @$TEST_PLANS_DIR/assets/config.json
 
-# PM Mapper startup and configuration
-mkdir /tmp/docker-compose
-cd /tmp/docker-compose
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
-CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs)
-sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml
-sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/4.4.4.4/'$MARIADB'/g' docker-compose.yml
-docker-compose up -d
-
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
-PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
-docker kill datarouter-node
-docker kill datarouter-prov
-sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml
-sed -i 's/3.3.3.3/'$PMMAPPER_IP'/g' docker-compose.yml
-docker-compose up -d
-
-# Setting up PM Mapper certs.
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks.b64 pmmapper:opt/app/pm-mapper/etc/
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass pmmapper:opt/app/pm-mapper/etc/
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks.b64 pmmapper:opt/app/pm-mapper/etc/
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass pmmapper:opt/app/pm-mapper/etc/
-docker restart pmmapper
+docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d pmmapper
+sleep 2
 
 # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS
+containers_ok=false
 for i in {1..5}; do
     if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
         [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
         [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' mr-simulator) ] && \
         [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
         [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ]
+        [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ]
     then
-        echo "Message Router, Data Router, Consul, Config Binding Service Running and PM Mapper services are running healthy"
+        echo "All required docker containers are up."
+        containers_ok=true
         break
     else
-        echo sleep $i
         sleep $i
     fi
 done
+[ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
+
 # Data Router Configuration.
-DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
-DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov)
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP"
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP"
+docker exec -i datarouter-prov sh -c \
+    "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP"
+docker exec -i datarouter-prov sh -c \
+    "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$GATEWAY_IP"
 
 # Create PM Mapper feed and create PM Mapper subscriber on data router
-curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
-curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
+curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" \
+      --data-ascii @$TEST_PLANS_DIR/assets/createFeed.json \
+      --post301 --location-trusted -k https://${DR_PROV_IP}:8443
+curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" \
+      --data-ascii @$TEST_PLANS_DIR/assets/addSubscriber.json \
+      --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
 
-# Simulation setup for Message Router
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js mariadb:/
-docker exec mariadb /bin/bash -c "apt update"
-sleep 2
-docker exec mariadb /bin/bash -c "apt install nodejs -y"
+docker cp pmmapper:/var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log /tmp/pmmapper.log
 sleep 10
-docker exec mariadb /bin/bash -c "nodejs mrserver.js &" &
-
-PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
-docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log
-cat /tmp/pmmapper.log
 docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv"
-sleep 10
 curl -k https://$DR_PROV_IP:8443/internal/prov
+
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}"
\ No newline at end of file
+ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}"
diff --git a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
index 45ef0d9..77bed8e 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
+++ b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 echo "Starting teardown script"
+TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper
+mkdir -p $WORKSPACE/archives
 docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log"
-kill-instance.sh $DMAAP
-kill-instance.sh $KAFKA
-kill-instance.sh $ZOOKEEPER
-kill-instance.sh datarouter-node
-kill-instance.sh datarouter-prov
-kill-instance.sh mariadb
-kill-instance.sh cbs
-kill-instance.sh consul
-kill-instance.sh pmmapper
\ No newline at end of file
+docker-compose -f $TEST_PLANS_DIR/docker-compose.yml logs > $WORKSPACE/archives/pmmapper-docker-compose.log
+docker-compose -f $TEST_PLANS_DIR/docker-compose.yml down -v
diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh
index 6a1f37f..377ce4b 100644
--- a/plans/policy/apex-pdp/setup.sh
+++ b/plans/policy/apex-pdp/setup.sh
@@ -3,7 +3,7 @@
 #  Copyright (C) 2018 Ericsson. All rights reserved.
 #
 #  Modifications copyright (c) 2019 Nordix Foundation.
-#  Modifications Copyright (C) 2019 AT&T Intellectual Property.
+#  Modifications Copyright (C) 2020 AT&T Intellectual Property.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,30 +46,9 @@
   exit 1
 fi
 
-# bring down maven
-mkdir maven
-cd maven
-# download maven from automatically selected mirror server
-curl -vLO  "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz"
-if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then
-    echo "Installation of maven has failed!"
-    exit 1
-fi
-ls -l
-export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v
-cd ..
-
-git clone http://gerrit.onap.org/r/oparent
-git clone --depth 1 https://gerrit.onap.org/r/policy/models -b ${GERRIT_BRANCH}
-cd models/models-sim/models-sim-dmaap
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install -DskipTests  --settings ${WORK_DIR}/oparent/settings.xml
-bash ./src/main/package/docker/docker_build.sh
-cd ${WORKSPACE}
-rm -rf ${WORK_DIR}
-sleep 3
-
 sudo apt-get -y install libxml2-utils
+bash ${SCRIPTS}/policy/policy-models-dmaap-sim.sh
+
 POLICY_API_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/api/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
 export POLICY_API_VERSION="${POLICY_API_VERSION_EXTRACT:0:3}-SNAPSHOT-latest"
 POLICY_PAP_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/pap/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
diff --git a/plans/policy/distribution/setup.sh b/plans/policy/distribution/setup.sh
index 940b0c6..d1a0863 100644
--- a/plans/policy/distribution/setup.sh
+++ b/plans/policy/distribution/setup.sh
@@ -3,7 +3,7 @@
 #  Copyright (C) 2018 Ericsson. All rights reserved.
 #
 #  Modifications copyright (c) 2019 Nordix Foundation.
-#  Modifications Copyright (C) 2019 AT&T Intellectual Property.
+#  Modifications Copyright (C) 2020 AT&T Intellectual Property.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
-
 source ${SCRIPTS}/policy/config/policy-csit.conf
 export POLICY_MARIADB_VER
 echo ${GERRIT_BRANCH}
@@ -47,30 +46,9 @@
   exit 1
 fi
 
-# bring down maven
-mkdir maven
-cd maven
-# download maven from automatically selected mirror server
-curl -vLO  "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz"
-if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then
-    echo "Installation of maven has failed!"
-    exit 1
-fi
-ls -l
-export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v
-cd ..
-
-git clone http://gerrit.onap.org/r/oparent
-git clone --depth 1 https://gerrit.onap.org/r/policy/models -b ${GERRIT_BRANCH}
-cd models/models-sim/models-sim-dmaap
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install -DskipTests  --settings ${WORK_DIR}/oparent/settings.xml
-bash ./src/main/package/docker/docker_build.sh
-cd ${WORKSPACE}
-rm -rf ${WORK_DIR}
-sleep 3
-
 sudo apt-get -y install libxml2-utils
+bash ${SCRIPTS}/policy/policy-models-dmaap-sim.sh
+
 POLICY_API_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/api/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
 export POLICY_API_VERSION="${POLICY_API_VERSION_EXTRACT:0:3}-SNAPSHOT-latest"
 POLICY_PAP_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/pap/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh
index e66102c..79c4307 100644
--- a/plans/policy/xacml-pdp/setup.sh
+++ b/plans/policy/xacml-pdp/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+#  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,32 +44,9 @@
     exit 1
 fi
 
-# bring down maven
-mkdir maven
-cd maven
-# download maven from automatically selected mirror server
-curl -vLO  "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz"
-if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then
-    echo "Installation of maven has failed!"
-    exit 1
-fi
-ls -l
-export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v
-cd ..
-
-git clone http://gerrit.onap.org/r/oparent
-git clone --depth 1 https://gerrit.onap.org/r/policy/models -b ${GERRIT_BRANCH}
-cd models/models-sim/models-sim-dmaap
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install -DskipTests  --settings ${WORK_DIR}/oparent/settings.xml
-bash ./src/main/package/docker/docker_build.sh
-cd ${WORKSPACE}
-rm -rf ${WORK_DIR}
-sleep 3
-
-
-
 sudo apt-get -y install libxml2-utils
+bash ${SCRIPTS}/policy/policy-models-dmaap-sim.sh
+
 POLICY_API_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/api/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
 export POLICY_API_VERSION="${POLICY_API_VERSION_EXTRACT:0:3}-SNAPSHOT-latest"
 POLICY_PAP_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/pap/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
@@ -80,6 +57,7 @@
 echo ${POLICY_API_VERSION}
 echo ${POLICY_PAP_VERSION}
 echo ${POLICY_XACML_PDP_VERSION}
+
 # Adding this waiting container due to race condition between pap and mariadb
 docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_dependencies
 
diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/pom.xml b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/pom.xml
index e6a210a..26815ad 100644
--- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/pom.xml
+++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/pom.xml
@@ -39,6 +39,22 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/plans/so/integration-etsi-testing/so-simulators/pom.xml b/plans/so/integration-etsi-testing/so-simulators/pom.xml
index 80d4ba9..372b073 100644
--- a/plans/so/integration-etsi-testing/so-simulators/pom.xml
+++ b/plans/so/integration-etsi-testing/so-simulators/pom.xml
@@ -1,23 +1,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.onap.so.simulators</groupId>
     <artifactId>so-simulators</artifactId>
-
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <version>1.0-SNAPSHOT</version>
-
     <properties>
         <jax.ws.rs>2.1</jax.ws.rs>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <jaxb.version>2.3.0</jaxb.version>
+        <javax.version>1.1.1</javax.version>
         <java.version>1.8</java.version>
     </properties>
-
     <modules>
         <module>common</module>
         <module>sdc-simulator</module>
@@ -26,16 +24,35 @@
         <module>vnfm-simulator</module>
         <module>package</module>
     </modules>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-                <version>2.0.5.RELEASE</version>
+                <version>2.1.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-core</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+                <version>${javax.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -67,4 +84,4 @@
             <version>${jax.ws.rs}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
index f96224d..2f24ef6 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
@@ -52,6 +52,7 @@
 @Controller
 @RequestMapping(path = OPERATIONS_URL)
 public class OperationsController {
+    private static final String HTTP_STATUS_OK = HttpStatus.OK.value() + "";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OperationsController.class);
 
@@ -80,7 +81,7 @@
         final Output output = getOutput(apiServiceOperationInformation);
         final OutputRequest outputRequest = new OutputRequest(output);
 
-        if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
+        if (output.getResponseCode().equals(HTTP_STATUS_OK)) {
             LOGGER.info("Sucessfully executed service request sending response: {}", outputRequest);
             return ResponseEntity.ok(outputRequest);
         }
@@ -106,7 +107,7 @@
         final Output output = getOutput(apiVnfOperationInformation);
         final OutputRequest outputRequest = new OutputRequest(output);
 
-        if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
+        if (output.getResponseCode().equals(HTTP_STATUS_OK)) {
             LOGGER.info("Sucessfully executed request vnf sending response: {}", outputRequest);
             return ResponseEntity.ok(outputRequest);
         }
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/providers/ServiceOperationsCacheServiceProviderimpl.java b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/providers/ServiceOperationsCacheServiceProviderimpl.java
index dae8b7f..88db4c1 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/providers/ServiceOperationsCacheServiceProviderimpl.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/providers/ServiceOperationsCacheServiceProviderimpl.java
@@ -78,6 +78,8 @@
 public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServiceProvider
         implements ServiceOperationsCacheServiceProvider {
 
+    private static final String HTTP_STATUS_BAD_REQUEST = Integer.toString(HttpStatus.BAD_REQUEST.value());
+    private static final String HTTP_STATUS_OK = Integer.toString(HttpStatus.OK.value());
     private static final String EMPTY_STRING = "";
     private static final Logger LOGGER = LoggerFactory.getLogger(ServiceOperationsCacheServiceProviderimpl.class);
 
@@ -114,7 +116,7 @@
                                 .instanceId(serviceInstanceId).objectPath(getObjectPath(serviceInstanceId)));
             }
             LOGGER.error("serviceInstanceId: {} already exists", serviceInstanceId);
-            return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.BAD_REQUEST.toString())
+            return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                     .responseMessage("serviceInstanceId: " + serviceInstanceId + " already exists")
                     .svcRequestId(svcRequestId);
         }
@@ -122,7 +124,7 @@
         LOGGER.error(
                 "Unable to add GenericResourceApiServiceOperationInformation in cache due to invalid input: {}... ",
                 input);
-        return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.BAD_REQUEST.toString())
+        return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                 .responseMessage("Service instance not found").svcRequestId(svcRequestId);
 
     }
@@ -141,7 +143,7 @@
                 LOGGER.info("Deleting GenericResourceApiServiceOperationInformation from cache using key: {}",
                         serviceInstanceId);
                 cache.evict(serviceInstanceId);
-                return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.OK.toString())
+                return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_OK)
                         .responseMessage(EMPTY_STRING).svcRequestId(svcRequestId).serviceResponseInformation(
                                 new GenericResourceApiInstanceReference().instanceId(serviceInstanceId));
             }
@@ -151,7 +153,7 @@
 
         }
         LOGGER.error("Unable to remove service instance from cache due to invalid input: {}... ", input);
-        return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.BAD_REQUEST.toString())
+        return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                 .responseMessage("Unable to remove service").svcRequestId(svcRequestId);
     }
 
@@ -208,7 +210,7 @@
                                         .objectPath(getObjectPath(serviceInstanceId, vnfId)));
                     }
                     LOGGER.error("vnfId: {} already exists with SVC Action: {}", vnfId, svcAction);
-                    return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.BAD_REQUEST.toString())
+                    return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                             .responseMessage("vnfId: " + vnfId + " already exists").svcRequestId(svcRequestId);
                 }
             }
@@ -220,7 +222,7 @@
         LOGGER.error(
                 "Unable to add GenericResourceApiServiceOperationInformation in cache due to invalid input: {}... ",
                 input);
-        return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.BAD_REQUEST.toString())
+        return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                 .responseMessage("Unable to add vnf").svcRequestId(svcRequestId);
     }
 
@@ -256,7 +258,7 @@
                             return false;
                         });
 
-                        return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.OK.toString())
+                        return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_OK)
                                 .responseMessage(EMPTY_STRING).svcRequestId(svcRequestId)
                                 .serviceResponseInformation(
                                         new GenericResourceApiInstanceReference().instanceId(serviceInstanceId))
@@ -271,7 +273,7 @@
 
         }
         LOGGER.error("Unable to remove vnf instance from cache due to invalid input: {}... ", input);
-        return new Output().ackFinalIndicator(YES).responseCode(HttpStatus.BAD_REQUEST.toString())
+        return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                 .responseMessage("Unable to remove vnf").svcRequestId(svcRequestId);
 
     }
@@ -406,7 +408,7 @@
 
         final GenericResourceApiServicestatusServiceStatus serviceStatus =
                 getServiceStatus(getSvcAction(input.getSdncRequestHeader()),
-                        getRequestAction(input.getRequestInformation()), HttpStatus.OK.toString());
+                        getRequestAction(input.getRequestInformation()), HTTP_STATUS_OK);
 
         return new GenericResourceApiServicemodelinfrastructureService().serviceData(apiServicedataServiceData)
                 .serviceStatus(serviceStatus).serviceInstanceId(serviceInstanceId);
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/test/java/org/onap/so/sdncsimulator/controller/OperationsControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/test/java/org/onap/so/sdncsimulator/controller/OperationsControllerTest.java
index b498bd6..888a251 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/test/java/org/onap/so/sdncsimulator/controller/OperationsControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/test/java/org/onap/so/sdncsimulator/controller/OperationsControllerTest.java
@@ -71,6 +71,9 @@
 @Configuration
 public class OperationsControllerTest {
 
+    private static final String HTTP_STATUS_BAD_REQUEST = Integer.toString(HttpStatus.BAD_REQUEST.value());
+    private static final String HTTP_STATUS_OK = Integer.toString(HttpStatus.OK.value());
+
     private static final String SVC_REQUEST_ID = "04fc9f50-87b8-430d-a232-ef24bd6c4150";
 
     private static final String VNF_SVC_REQUEST_ID = "8fd2622b-01fc-424d-bfc8-f48bcd64e546";
@@ -112,7 +115,7 @@
         final Output actualObject = actualOutputRequest.getOutput();
 
         assertNotNull(actualObject);
-        assertEquals(HttpStatus.OK.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_OK, actualObject.getResponseCode());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
         assertEquals(SVC_REQUEST_ID, actualObject.getSvcRequestId());
         assertNotNull(actualObject.getServiceResponseInformation());
@@ -157,7 +160,7 @@
 
         final Output actualObject = actualOutputRequest.getOutput();
         assertNotNull(actualObject);
-        assertEquals(HttpStatus.BAD_REQUEST.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_BAD_REQUEST, actualObject.getResponseCode());
         assertEquals(SVC_REQUEST_ID, actualObject.getSvcRequestId());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
 
@@ -183,7 +186,7 @@
 
         final Output actualObject = actualOutputRequest.getOutput();
 
-        assertEquals(HttpStatus.OK.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_OK, actualObject.getResponseCode());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
         assertEquals(VNF_SVC_REQUEST_ID, actualObject.getSvcRequestId());
         assertNotNull(actualObject.getServiceResponseInformation());
@@ -242,7 +245,7 @@
 
         final Output actualObject = badOutputRequest.getOutput();
         assertNotNull(actualObject);
-        assertEquals(HttpStatus.BAD_REQUEST.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_BAD_REQUEST, actualObject.getResponseCode());
         assertEquals(VNF_SVC_REQUEST_ID, actualObject.getSvcRequestId());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
 
@@ -276,7 +279,7 @@
 
         final Output actualObject = actualOutputRequest.getOutput();
 
-        assertEquals(HttpStatus.OK.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_OK, actualObject.getResponseCode());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
         assertEquals(VNF_SVC_REQUEST_ID, actualObject.getSvcRequestId());
         assertNotNull(actualObject.getServiceResponseInformation());
@@ -349,7 +352,7 @@
 
         final Output actualObject = actualOutputRequest.getOutput();
 
-        assertEquals(HttpStatus.OK.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_OK, actualObject.getResponseCode());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
         assertEquals(VNF_SVC_REQUEST_ID, actualObject.getSvcRequestId());
 
@@ -395,7 +398,7 @@
 
         final Output actualObject = actualOutputRequest.getOutput();
 
-        assertEquals(HttpStatus.OK.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_OK, actualObject.getResponseCode());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
         assertEquals(SVC_REQUEST_ID, actualObject.getSvcRequestId());
 
@@ -435,7 +438,7 @@
 
         final Output actualObject = actualOutputRequest.getOutput();
 
-        assertEquals(HttpStatus.OK.toString(), actualObject.getResponseCode());
+        assertEquals(HTTP_STATUS_OK, actualObject.getResponseCode());
         assertEquals(Constants.YES, actualObject.getAckFinalIndicator());
         assertEquals(SVC_REQUEST_ID, actualObject.getSvcRequestId());
 
diff --git a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-api/pom.xml b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-api/pom.xml
index ade3e01..23dc243 100644
--- a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-api/pom.xml
+++ b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-api/pom.xml
@@ -1,106 +1,121 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.simulators.vnfm</groupId>
-    <artifactId>vnfm-simulator</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>vnfm-api</artifactId>
-  <name>${project.artifactId}</name>
-  <properties>
-    <gson-fire-version>1.8.2</gson-fire-version>
-    <retrofit-version>2.3.0</retrofit-version>
-    <threetenbp-version>1.3.5</threetenbp-version>
-    <rxjava-version>2.0.0-RC1</rxjava-version>
-    <oltu-version>1.0.1</oltu-version>
-    <swagger-core-version>1.5.15</swagger-core-version>
-    <gson-version>2.8.5</gson-version>
-  </properties>
-  <description>VNFM Simulator adapter API</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>2.3.1</version>
-        <executions>
-          <execution>
-            <id>vnfmsimulator</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/vnfm-sim-swagger.yaml</inputSpec>
-              <language>java</language>
-              <library>retrofit2</library>
-              <output>${project.build.directory}/generated-sources/vnfmsimulator</output>
-              <apiPackage>org.onap.vnfm.v1.api</apiPackage>
-              <modelPackage>org.onap.vnfm.v1.model</modelPackage>
-              <configOptions>
-                <jackson>true</jackson>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-              </configOptions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-gson</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>retrofit</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-scalars</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.client</artifactId>
-      <version>${oltu-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.gsonfire</groupId>
-      <artifactId>gson-fire</artifactId>
-      <version>${gson-fire-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <version>${threetenbp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-      <version>${rxjava-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>adapter-rxjava2</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${gson-version}</version>
-    </dependency>
-  </dependencies>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.so.simulators.vnfm</groupId>
+        <artifactId>vnfm-simulator</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>vnfm-api</artifactId>
+    <name>${project.artifactId}</name>
+    <properties>
+        <gson-fire-version>1.8.2</gson-fire-version>
+        <retrofit-version>2.3.0</retrofit-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
+        <rxjava-version>2.0.0-RC1</rxjava-version>
+        <oltu-version>1.0.1</oltu-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
+        <gson-version>2.8.5</gson-version>
+    </properties>
+    <description>VNFM Simulator adapter API</description>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <version>2.3.1</version>
+                <executions>
+                    <execution>
+                        <id>vnfmsimulator</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${basedir}/src/main/resources/vnfm-sim-swagger.yaml</inputSpec>
+                            <language>java</language>
+                            <library>retrofit2</library>
+                            <output>${project.build.directory}/generated-sources/vnfmsimulator</output>
+                            <apiPackage>org.onap.vnfm.v1.api</apiPackage>
+                            <modelPackage>org.onap.vnfm.v1.model</modelPackage>
+                            <configOptions>
+                                <jackson>true</jackson>
+                                <sourceFolder>src/gen/java/main</sourceFolder>
+                                <withXml>true</withXml>
+                                <useRxJava2>true</useRxJava2>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-gson</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-scalars</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>${oltu-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson-fire-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.threeten</groupId>
+            <artifactId>threetenbp</artifactId>
+            <version>${threetenbp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>${rxjava-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>adapter-rxjava2</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
similarity index 63%
rename from plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
rename to plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
index 7646c0b..f2d7a42 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
@@ -4,11 +4,11 @@
     container_name: pmmapper
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.1.3
     ports:
-     - "8081:8081"
+      - "8081:8081"
     environment:
-       CONFIG_BINDING_SERVICE_SERVICE_HOST: CBSIP
-       CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
-       HOSTNAME: pmmapper
+      CONFIG_BINDING_SERVICE_SERVICE_HOST: CBSIP
+      CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
+      HOSTNAME: pmmapper
     extra_hosts:
       - "dmaap-dr-node:1.1.1.1"
-      - "message-router:4.4.4.4"
+      - "message-router:4.4.4.4"
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
index c2feb52..00993b7 100644
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ b/plans/usecases/5G-bulkpm/setup.sh
@@ -202,7 +202,7 @@
 # PM Mapper startup and configuration
 mkdir /tmp/docker-compose
 cd /tmp/docker-compose
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
+cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
 CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs)
 sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml
 sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
diff --git a/plans/usecases/config-over-netconf/setup.sh b/plans/usecases/config-over-netconf/setup.sh
index 9e87b04..713d57d 100644
--- a/plans/usecases/config-over-netconf/setup.sh
+++ b/plans/usecases/config-over-netconf/setup.sh
@@ -44,6 +44,8 @@
 cd $SDNC_DOCKER_PATH
 unset http_proxy https_proxy
 
+docker pull $NETOPEER_DOCKER_REPO:$NETOPEER_IMAGE_TAG
+docker tag  $NETOPEER_DOCKER_REPO:$NETOPEER_IMAGE_TAG $NETOPEER_DOCKER_REPO:latest
 #sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" diocker-compose.yml
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
@@ -72,7 +74,8 @@
 INTERVAL=30
 TIME=0
 while [ "$TIME" -lt "$TIME_OUT" ]; do
-  response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck ); echo $response
+  response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck );
+  echo $response
 
   if [ "$response" == "200" ]; then
     echo SDNC started in $TIME seconds
@@ -108,42 +111,6 @@
 
 #########################check if server is up gracefully ######################################
 
-TIME_OUT=1500
-INTERVAL=60
-TIME=0
-while [ "$TIME" -lt "$TIME_OUT" ]; do
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-
-  if [ "$response" == "Level 100" ] ; then
-    echo SDNC karaf started in $TIME seconds
-    break;
-  fi
-
-  echo Sleep: $INTERVAL seconds before testing if SDNC is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
-  sleep $INTERVAL
-  TIME=$(($TIME+$INTERVAL))
-done
-
-if [ "$TIME" -ge "$TIME_OUT" ]; then
-   echo TIME OUT: karaf session not started in $TIME_OUT seconds... Could cause problems for testing activities...
-fi
-
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-
-  if [ "$response" == "Level 100" ] ; then
-    num_failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l)
-    failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure)
-    echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.
-  fi
-
-if [ "$num_failed_bundles" -ge 1 ]; then
-  echo "The following bundle(s) are in a failed state: "
-  echo "  $failed_bundles"
-fi
-
-
 # Sleep additional 3 minutes (180 secs) to give application time to finish
 
 sleep 150
diff --git a/plans/usecases/config-over-netconf/teardown.sh b/plans/usecases/config-over-netconf/teardown.sh
index 5bf1b90..9613e3e 100755
--- a/plans/usecases/config-over-netconf/teardown.sh
+++ b/plans/usecases/config-over-netconf/teardown.sh
@@ -4,6 +4,13 @@
 PNFSIM_DOCKER_COMPOSE_PATH=$INT_DOCKER_PATH/docker-compose.yml
 CDS_DOCKER_COMPOSE_PATH=$CDS_DOCKER_PATH/docker-compose.yaml
 
+echo "==========================blueprint-processor logs =================================="
+docker logs bp-rest
+
+echo "==========================sdnc-controller logs ======================================"
+docker logs sdnc_controller_container
+
+
 docker-compose -f $SDNC_DOCKER_COMPOSE_PATH down
 docker-compose -f $PNFSIM_DOCKER_COMPOSE_PATH down
 docker-compose -f $CDS_DOCKER_COMPOSE_PATH down
diff --git a/plans/usecases/config-over-netconf/test.properties b/plans/usecases/config-over-netconf/test.properties
index bdce15a..ee00246 100644
--- a/plans/usecases/config-over-netconf/test.properties
+++ b/plans/usecases/config-over-netconf/test.properties
@@ -1,13 +1,14 @@
 NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 NEXUS_USERNAME=docker
 NEXUS_PASSWD=docker
-SDNC_IMAGE_TAG=1.7.3
-ANSIBLE_IMAGE_TAG=1.7.3
-BP_IMAGE_TAG=0.6.3
+SDNC_IMAGE_TAG=1.7.6
+ANSIBLE_IMAGE_TAG=1.7.6
+BP_IMAGE_TAG=0.6.4
 REQUEST_DATA_PATH=$WORKSPACE/tests/$PARENT/$SUB_PARENT/data
 TC_PLANS_PATH=$WORKSPACE/plans/$PARENT/$SUB_PARENT
 CDS_DOCKER_PATH=$TC_PLANS_PATH/cds
 SDNC_DOCKER_PATH=$TC_PLANS_PATH/sdn
 INT_DOCKER_PATH=$WORKSPACE/temp/integration/test/mocks/pnfsimulator
 CERT_SUBPATH=$TC_PLANS_PATH/certs
-
+NETOPEER_DOCKER_REPO=sysrepo/sysrepo-netopeer2
+NETOPEER_IMAGE_TAG=v0.7.7
diff --git a/scripts/policy/config/drools/base.conf b/scripts/policy/config/drools/base.conf
index d3164cb..1e57226 100644
--- a/scripts/policy/config/drools/base.conf
+++ b/scripts/policy/config/drools/base.conf
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 
 POLICY_HOME=/opt/app/policy
 POLICY_LOGS=/var/log/onap/policy/pdpd
-JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
 KEYSTORE_PASSWD=Pol1cy_0nap
 TRUSTSTORE_PASSWD=Pol1cy_0nap
 
diff --git a/scripts/policy/config/policy-csit.conf b/scripts/policy/config/policy-csit.conf
index aa5f939..1858698 100644
--- a/scripts/policy/config/policy-csit.conf
+++ b/scripts/policy/config/policy-csit.conf
@@ -1,2 +1,3 @@
 GERRIT_BRANCH=master
 POLICY_MARIADB_VER=10.2.25
+NEXUS_URL=https://nexus.onap.org/content/repositories/snapshots
diff --git a/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar
index 8a31618..76f45ea 100644
--- a/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar
+++ b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar
Binary files differ
diff --git a/scripts/policy/policy-models-dmaap-sim.sh b/scripts/policy/policy-models-dmaap-sim.sh
new file mode 100644
index 0000000..0abd9f9
--- /dev/null
+++ b/scripts/policy/policy-models-dmaap-sim.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+source ${SCRIPTS}/policy/config/policy-csit.conf
+
+POLICY_MODELS_VERSION_EXTRACT="$(curl -q --silent https://git.onap.org/policy/models/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
+export POLICY_MODELS_VERSION="${POLICY_MODELS_VERSION_EXTRACT}"
+echo ${POLICY_MODELS_VERSION}
+
+# download dmaap tarball and build docker image
+git clone --depth 1 https://gerrit.onap.org/r/policy/models -b ${GERRIT_BRANCH}
+cd models/models-sim/models-sim-dmaap
+item=`curl --silent -L ${NEXUS_URL}/org/onap/policy/models/sim/policy-models-sim-dmaap/${POLICY_MODELS_VERSION} | egrep 'policy-models-sim-dmaap-.*tarball' | cut '-d"' -f2 | egrep 'gz$' | sort | tail -1`
+mkdir target
+curl -L $item -o target/policy-models-sim-dmaap-${POLICY_MODELS_VERSION}-tarball.tar.gz
+bash ./src/main/package/docker/docker_build.sh
+cd ${WORKSPACE}
+rm -rf ${WORK_DIR}
+
diff --git a/scripts/policy/policy-xacml-pdp/config/db/db.sh b/scripts/policy/policy-xacml-pdp/config/db/db.sh
old mode 100644
new mode 100755
index ac150a0..499764d
--- a/scripts/policy/policy-xacml-pdp/config/db/db.sh
+++ b/scripts/policy/policy-xacml-pdp/config/db/db.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xv
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+#  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-for db in policyadmin
+for db in policyadmin operationshistory
 do
      mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};"
      mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;"
 done
 
-mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "FLUSH PRIVILEGES;"
\ No newline at end of file
+mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "FLUSH PRIVILEGES;"
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index 1e6d310..212dfe0 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -57,7 +57,7 @@
     ${ves_event}=    Get Data From File    ${test_case_directory}/ves-event.json
     Ensure Container Is Exited    aai_simulator
     Set VES event in DMaaP    ${ves_event}
-    Wait for one of PRH log entries    90s    connection timed out: aai    Host is unreachable: aai
+    Wait for one of PRH log entries    90s    connection timed out: aai    Host is unreachable: aai    No route to host: aai
     [Teardown]    Ensure Container Is Running   aai_simulator
 
 Verify PNF re registration
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves7_missing_mandatory_domain.json b/tests/dcaegen2/testcases/assets/json_events/ves7_missing_mandatory_domain.json
new file mode 100644
index 0000000..5178755
--- /dev/null
+++ b/tests/dcaegen2/testcases/assets/json_events/ves7_missing_mandatory_domain.json
@@ -0,0 +1,33 @@
+{
+    "event": {
+        "commonEventHeader": {
+            "version": "4.0.1",
+            "vesEventListenerVersion": "7.0.1",
+            "eventName": "Fault_Vscf:Acs-Ericcson_PilotNumberPoolExhaustion",
+            "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015",
+            "sequence": 1,
+            "priority": "High",
+            "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",
+            "reportingEntityName": "ibcx0001vm002oam001",
+            "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",
+            "sourceName": "scfx0001vm002cap001",
+            "nfVendorName": "Ericsson",
+            "nfNamingCode": "scfx",
+            "nfcNamingCode": "ssc",
+            "startEpochMicrosec": 1413378172000000,
+            "lastEpochMicrosec": 1413378172000000,
+            "timeZoneOffset": "UTC-05:30"
+        },
+        "faultFields": {
+            "faultFieldsVersion": "4.0",
+            "alarmCondition": "PilotNumberPoolExhaustion",
+            "eventSourceType": "other",
+            "specificProblem": "Calls cannot complete - pilot numbers are unavailable",
+            "eventSeverity": "CRITICAL",
+            "vfStatus": "Active",
+            "alarmAdditionalInformation": {
+                "PilotNumberPoolSize": "1000"
+            }
+        }
+    }
+}
diff --git a/tests/dcaegen2/testcases/dcae_ves.robot b/tests/dcaegen2/testcases/dcae_ves.robot
index 48912e1..e12097e 100644
--- a/tests/dcaegen2/testcases/dcae_ves.robot
+++ b/tests/dcaegen2/testcases/dcae_ves.robot
@@ -31,6 +31,11 @@
     [Documentation]   Post single event with invalid data to /eventListener/v7 endpoint and expect 400 Response Status Code
     Send Request And Validate Response  Publish Event To VES Collector  ${http_session}  ${VES_EVENTLISTENER_V7}  ${VES_INVALID_JSON_V7}  400
 
+Publish Single VES VNF Measurement Event with missing mandatory parameter domain
+    [Tags]    DCAE-VESC-R1
+    [Documentation]   Post single event with lack of one of the mandatory parameters "domain" to /eventListener/v7 endpoint and expect 400 Response Status Code
+    Send Request And Validate Response  Publish Event To VES Collector  ${http_session}  ${VES_EVENTLISTENER_V7}  ${VES_MISSING_MANDATORY_DOMAIN_V7}  400
+
 Publish Single VES VNF Measurement Event with No Auth over HTTPS
     [Tags]    DCAE-VESC-R1
     [Documentation]   Post single event over HTTPS with authentication disabled and expect ConnectionError
diff --git a/tests/dcaegen2/testcases/resources/dcae_properties.robot b/tests/dcaegen2/testcases/resources/dcae_properties.robot
index 119ef23..5262330 100644
--- a/tests/dcaegen2/testcases/resources/dcae_properties.robot
+++ b/tests/dcaegen2/testcases/resources/dcae_properties.robot
@@ -31,6 +31,7 @@
 ${VES_BATCH_EVENT_ENDPOINT_V7}           /eventListener/v7/eventBatch
 ${VES_VALID_JSON_V7}                     %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves7_valid.json
 ${VES_INVALID_JSON_V7}                   %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves7_invalid.json
+${VES_MISSING_MANDATORY_DOMAIN_V7}       %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves7_missing_mandatory_domain.json
 ${VES_VALID_BATCH_JSON_V7}               %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves7_batch_valid.json
 ${EVENT_DATA_FILE}                       %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json
 ${EVENT_MEASURE_FILE}                    %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json
diff --git a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
index 0a87dd9..b58e5b5 100644
--- a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
+++ b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
@@ -10,6737 +10,7423 @@
           "name": "onap.policies.controlloop.Operational.apex.sampledomain",
           "version": "1.0.0",
           "properties": {
-            "content": {
-              "engineServiceParameters": {
-                "name": "MyApexEngine",
-                "version": "0.0.1",
-                "id": 45,
-                "instanceCount": 4,
-                "deploymentPort": 12561,
-                "policy_type_impl": {
-                    "apexPolicyModel" : {
-                       "key" : {
-                          "name" : "SamplePolicyModelJAVASCRIPT",
-                          "version" : "0.0.1"
-                       },
-                       "keyInformation" : {
-                          "key" : {
-                             "name" : "KeyInformation",
-                             "version" : "0.0.1"
+            "engineServiceParameters": {
+              "name": "MyApexEngine",
+              "version": "0.0.1",
+              "id": 45,
+              "instanceCount": 4,
+              "deploymentPort": 12561,
+              "policy_type_impl": {
+                "apexPolicyModel": {
+                  "key": {
+                    "name": "SamplePolicyModelJAVASCRIPT",
+                    "version": "0.0.1"
+                  },
+                  "keyInformation": {
+                    "key": {
+                      "name": "KeyInformation",
+                      "version": "0.0.1"
+                    },
+                    "keyInfoMap": {
+                      "entry": [
+                        {
+                          "key": {
+                            "name": "Context",
+                            "version": "0.0.1"
                           },
-                          "keyInfoMap" : {
-                             "entry" : [ {
-                                "key" : {
-                                   "name" : "Context",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Context",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "ca36bfd8-6042-3633-8c85-89c66507c3bf",
-                                   "description" : "Generated description for concept referred to by key \"Context:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0000",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0000",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "465a81cc-885f-3a4d-bc4e-1508da92b236",
-                                   "description" : "Generated description for concept referred to by key \"Event0000:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0001",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0001",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "36b2d570-fff7-3a4b-bab2-6bf492f5129a",
-                                   "description" : "Generated description for concept referred to by key \"Event0001:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0002",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0002",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "ff6160a7-fb5e-379c-a6d2-2cd28053eacf",
-                                   "description" : "Generated description for concept referred to by key \"Event0002:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0003",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0003",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "5899e216-2abf-3781-abc4-2c257b92721e",
-                                   "description" : "Generated description for concept referred to by key \"Event0003:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0004",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0004",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "7c2692a7-4587-3d09-abf9-d96b339a316f",
-                                   "description" : "Generated description for concept referred to by key \"Event0004:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0100",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0100",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "b696048c-c0b0-34c1-8dbe-32ab6c8bc0c7",
-                                   "description" : "Generated description for concept referred to by key \"Event0100:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0101",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0101",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "edbfa868-2ab2-30fd-8078-4c7f67ca6122",
-                                   "description" : "Generated description for concept referred to by key \"Event0101:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0102",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0102",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "6b6ad2ff-ef63-3f7b-aabb-fba44f8de9d4",
-                                   "description" : "Generated description for concept referred to by key \"Event0102:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0103",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0103",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "c2550912-10d9-3000-8826-377288cd6cb1",
-                                   "description" : "Generated description for concept referred to by key \"Event0103:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0104",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0104",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "f6d75b71-c8a7-3337-a121-88d68c389f5a",
-                                   "description" : "Generated description for concept referred to by key \"Event0104:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Events",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Events",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "0215644c-4531-375c-8335-d558b4de8c03",
-                                   "description" : "Generated description for concept referred to by key \"Events:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "ExternalContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "976a79e7-5c80-3c03-9503-da3f41fec395",
-                                   "description" : "Generated description for concept referred to by key \"ExternalContextAlbum:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "GlobalContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "c95e9e5f-d2c7-3ac7-a205-ea3574530cb7",
-                                   "description" : "Generated description for concept referred to by key \"GlobalContextAlbum:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "KeyInformation",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "KeyInformation",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "1ff2f905-685c-3caf-95bc-0bbc90345888",
-                                   "description" : "Generated description for concept referred to by key \"KeyInformation:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policies",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policies",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "f54c3b2b-be76-31c4-adfc-87c494c06808",
-                                   "description" : "Generated description for concept referred to by key \"Policies:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policy0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "3410e939-30ca-32c4-a2d8-c30b6fee6eec",
-                                   "description" : "Generated description for concept referred to by key \"Policy0:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy0ContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "e27564c4-3cbf-3db2-9bf3-83ae80a2f907",
-                                   "description" : "Generated description for concept referred to by key \"Policy0ContextAlbum:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policy1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "d0b2b585-f344-33b8-af9e-250e7f4cfbce",
-                                   "description" : "Generated description for concept referred to by key \"Policy1:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy1ContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "815d74ae-6fc0-3221-87b9-2bb1dfdfa7f0",
-                                   "description" : "Generated description for concept referred to by key \"Policy1ContextAlbum:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "SamplePolicyModelJAVASCRIPT",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "SamplePolicyModelJAVASCRIPT",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "bc8ee312-81ce-3c4a-92d5-4a73b8077148",
-                                   "description" : "Generated description for concept referred to by key \"SamplePolicyModelJAVASCRIPT:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "0589ff20-adcc-3ce5-95fe-8d7978ed54ed",
-                                   "description" : "Generated description for concept referred to by key \"Task_Act0:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "095b126d-ca8b-32c9-ad52-d744e817a79c",
-                                   "description" : "Generated description for concept referred to by key \"Task_Act1:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "3d786b4c-d9ee-3367-ab71-c67271a4ea2f",
-                                   "description" : "Generated description for concept referred to by key \"Task_Act2:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "9231753e-20c5-3436-982f-9100340cc570",
-                                   "description" : "Generated description for concept referred to by key \"Task_Act3:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "502383d3-483f-3a56-a426-2f0406674c8d",
-                                   "description" : "Generated description for concept referred to by key \"Task_Decide0:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "16598106-41c8-3b5a-99c6-5fcf6d1a5ddf",
-                                   "description" : "Generated description for concept referred to by key \"Task_Decide1:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "ad3a89f5-e369-3c66-b22c-669f7b3653b8",
-                                   "description" : "Generated description for concept referred to by key \"Task_Decide2:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "56815939-1164-3867-9ed1-0a27ff8aafb3",
-                                   "description" : "Generated description for concept referred to by key \"Task_Decide3:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "0db0c566-ecd7-3e27-9865-4b82c893abdb",
-                                   "description" : "Generated description for concept referred to by key \"Task_Establish0:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "6944a4c1-6201-317c-8d7e-eaa7f2ee0ea0",
-                                   "description" : "Generated description for concept referred to by key \"Task_Establish1:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "0f766ea9-11cd-3e7d-a8c8-28c8dee6a85a",
-                                   "description" : "Generated description for concept referred to by key \"Task_Establish2:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "c3237a38-cc6d-3418-b1e1-0dc8b4bdcc66",
-                                   "description" : "Generated description for concept referred to by key \"Task_Establish3:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "051bcfd5-cf73-3c89-8ee7-ea6e005ec059",
-                                   "description" : "Generated description for concept referred to by key \"Task_Match0:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "3754fe19-98f2-34a1-9f45-db31052208d8",
-                                   "description" : "Generated description for concept referred to by key \"Task_Match1:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "8c200709-a180-3c8b-916f-275ff49ce194",
-                                   "description" : "Generated description for concept referred to by key \"Task_Match2:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "a1a879c6-4510-33b0-bbd0-ad6256189a37",
-                                   "description" : "Generated description for concept referred to by key \"Task_Match3:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Tasks",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Tasks",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "a7fab96b-ce1c-37ce-bbb2-556b6db524a5",
-                                   "description" : "Generated description for concept referred to by key \"Tasks:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestCase",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestCase",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "0a652886-c88d-3f8c-8994-ae9161e7c963",
-                                   "description" : "Generated description for concept referred to by key \"TestCase:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem000",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem000",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "8efba9fa-371e-33df-a7d6-88b0284e7fd0",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem000:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem001",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem001",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "3740077c-a2b3-356b-81dc-5ded2118a951",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem001:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem002",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem002",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "b5c7df95-9af5-322f-9ea8-eb440a2bf926",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem002:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem003",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem003",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "b36f0aa5-0fb9-3e2c-8fa2-fddb7fd05f4b",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem003:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem004",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem004",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "093cda11-eaeb-3a46-a5b6-d5e30c00935b",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem004:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem005",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem005",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "569a758d-ba40-37c0-aebb-7ad138df25ac",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem005:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem006",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem006",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "252818d9-b61f-3962-a905-8865fb00fb04",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem006:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem007",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem007",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "fe1a5f7c-c083-377b-a797-752b01fc6c73",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem007:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem008",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem008",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "aa87d007-d07e-3f67-8c6d-0ebc3d85479d",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem008:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem009",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem009",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "126e7a3a-11b6-3f88-9397-c21d8819f859",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem009:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem00A",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem00A",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "0e0e3dec-e03d-3379-a87b-1ecd4aa3d8cc",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem00A:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem00B",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem00B",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "dbdc98df-3ff4-360c-b8d3-a7a836ac3de6",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem00B:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem00C",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem00C",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "32a2f355-77f3-3b25-ace6-7a9c5763a5ad",
-                                   "description" : "Generated description for concept referred to by key \"TestContextItem00C:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestDatatypes",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestDatatypes",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "3f95472c-973e-30e2-95f1-bf00cbef909a",
-                                   "description" : "Generated description for concept referred to by key \"TestDatatypes:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestExternalContextItem",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestExternalContextItem",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "610dbbd4-9149-3b3c-9af4-819056f0e169",
-                                   "description" : "Generated description for concept referred to by key \"TestExternalContextItem:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestGlobalContextItem",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestGlobalContextItem",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "07fa8f68-55f1-3fd0-81c1-749a379753a7",
-                                   "description" : "Generated description for concept referred to by key \"TestGlobalContextItem:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestPolicyContextItem",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestPolicyContextItem",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "d9c93cd1-539e-35c5-aaec-bb711ceb1251",
-                                   "description" : "Generated description for concept referred to by key \"TestPolicyContextItem:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestSlogan",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestSlogan",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "683fe492-7eae-3ac7-9924-bb7850208d05",
-                                   "description" : "Generated description for concept referred to by key \"TestSlogan:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestTemperature",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestTemperature",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "bba25b6f-e3cd-3060-9022-4ef3a79f8eb0",
-                                   "description" : "Generated description for concept referred to by key \"TestTemperature:0.0.1\""
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestTimestamp",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestTimestamp",
-                                      "version" : "0.0.1"
-                                   },
-                                   "UUID" : "97b73937-c344-33c0-924c-4d26b6449564",
-                                   "description" : "Generated description for concept referred to by key \"TestTimestamp:0.0.1\""
-                                }
-                             } ]
+                          "value": {
+                            "key": {
+                              "name": "Context",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "ca36bfd8-6042-3633-8c85-89c66507c3bf",
+                            "description": "Generated description for concept referred to by key \"Context:0.0.1\""
                           }
-                       },
-                       "policies" : {
-                          "key" : {
-                             "name" : "Policies",
-                             "version" : "0.0.1"
+                        },
+                        {
+                          "key": {
+                            "name": "Event0000",
+                            "version": "0.0.1"
                           },
-                          "policyMap" : {
-                             "entry" : [ {
-                                "key" : {
-                                   "name" : "Policy0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "policyKey" : {
-                                      "name" : "Policy0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "template" : "MEDA",
-                                   "state" : {
-                                      "entry" : [ {
-                                         "key" : "Act",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Act"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0003",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Act_NULL",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0004",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "NULL",
-                                                        "parentKeyVersion" : "0.0.0",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "NULL"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Act1",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Act0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act0_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Act1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act1_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Act2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act2_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Act3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act3_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      }, {
-                                         "key" : "Decide",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Decide"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0002",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Decide_Act",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0003",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "Act"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "ExternalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "Policy0ContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Decide3",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Decide0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide0_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Decide1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide1_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Decide2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide2_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Decide3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide3_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      }, {
-                                         "key" : "Establish",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Establish"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0001",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Establish_Decide",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0002",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "Decide"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "ExternalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "Policy1ContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Establish2",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Establish0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish0_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Establish1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish1_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Establish2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish2_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Establish3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish3_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      }, {
-                                         "key" : "Match",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Match"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0000",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Match_Establish",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0001",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "Establish"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "Policy0ContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Match0",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Match0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match0_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Match1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match1_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Match2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match2_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Match3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match3_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy0",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      } ]
-                                   },
-                                   "firstState" : "Match"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "policyKey" : {
-                                      "name" : "Policy1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "template" : "MEDA",
-                                   "state" : {
-                                      "entry" : [ {
-                                         "key" : "Act",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Act"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0103",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Act_NULL",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0104",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "NULL",
-                                                        "parentKeyVersion" : "0.0.0",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "NULL"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Act0",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Act0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act0_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Act1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act1_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Act2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act2_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Act3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Task_Act3_DIRECT_Act_NULL"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Act",
-                                                        "localName" : "Act_NULL"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      }, {
-                                         "key" : "Decide",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Decide"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0102",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Decide_Act",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0103",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "Act"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "ExternalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "Policy1ContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Decide3",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Decide0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide0_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Decide1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide1_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Decide2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide2_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Decide3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Task_Decide3_DIRECT_Decide_Act"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Decide",
-                                                        "localName" : "Decide_Act"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      }, {
-                                         "key" : "Establish",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Establish"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0101",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Establish_Decide",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0102",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "Decide"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "ExternalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "Policy1ContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Establish1",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Establish0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish0_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Establish1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish1_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Establish2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish2_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Establish3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Task_Establish3_DIRECT_Establish_Decide"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Establish",
-                                                        "localName" : "Establish_Decide"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      }, {
-                                         "key" : "Match",
-                                         "value" : {
-                                            "stateKey" : {
-                                               "parentKeyName" : "Policy1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Match"
-                                            },
-                                            "trigger" : {
-                                               "name" : "Event0100",
-                                               "version" : "0.0.1"
-                                            },
-                                            "stateOutputs" : {
-                                               "entry" : [ {
-                                                  "key" : "Match_Establish",
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     },
-                                                     "outgoingEvent" : {
-                                                        "name" : "Event0101",
-                                                        "version" : "0.0.1"
-                                                     },
-                                                     "nextState" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "NULL",
-                                                        "localName" : "Establish"
-                                                     }
-                                                  }
-                                               } ]
-                                            },
-                                            "contextAlbumReference" : [ {
-                                               "name" : "ExternalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "GlobalContextAlbum",
-                                               "version" : "0.0.1"
-                                            }, {
-                                               "name" : "Policy1ContextAlbum",
-                                               "version" : "0.0.1"
-                                            } ],
-                                            "taskSelectionLogic" : {
-                                               "key" : "TaskSelectionLigic",
-                                               "logicFlavour" : "JAVASCRIPT",
-                                               "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
-                                            },
-                                            "stateFinalizerLogicMap" : {
-                                               "entry" : [ ]
-                                            },
-                                            "defaultTask" : {
-                                               "name" : "Task_Match3",
-                                               "version" : "0.0.1"
-                                            },
-                                            "taskReferences" : {
-                                               "entry" : [ {
-                                                  "key" : {
-                                                     "name" : "Task_Match0",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match0_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Match1",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match1_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Match2",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match2_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               }, {
-                                                  "key" : {
-                                                     "name" : "Task_Match3",
-                                                     "version" : "0.0.1"
-                                                  },
-                                                  "value" : {
-                                                     "key" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Task_Match3_DIRECT_Match_Establish"
-                                                     },
-                                                     "outputType" : "DIRECT",
-                                                     "output" : {
-                                                        "parentKeyName" : "Policy1",
-                                                        "parentKeyVersion" : "0.0.1",
-                                                        "parentLocalName" : "Match",
-                                                        "localName" : "Match_Establish"
-                                                     }
-                                                  }
-                                               } ]
-                                            }
-                                         }
-                                      } ]
-                                   },
-                                   "firstState" : "Match"
-                                }
-                             } ]
+                          "value": {
+                            "key": {
+                              "name": "Event0000",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "465a81cc-885f-3a4d-bc4e-1508da92b236",
+                            "description": "Generated description for concept referred to by key \"Event0000:0.0.1\""
                           }
-                       },
-                       "tasks" : {
-                          "key" : {
-                             "name" : "Tasks",
-                             "version" : "0.0.1"
+                        },
+                        {
+                          "key": {
+                            "name": "Event0001",
+                            "version": "0.0.1"
                           },
-                          "taskMap" : {
-                             "entry" : [ {
-                                "key" : {
-                                   "name" : "Task_Act0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestActCaseSelected",
-                                         "value" : {
-                                            "key" : "TestActCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestActStateTime",
-                                         "value" : {
-                                            "key" : "TestActStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      }, {
-                                         "key" : "Parameter2",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter2"
-                                            },
-                                            "defaultValue" : "DefaultValue2"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestActCaseSelected",
-                                         "value" : {
-                                            "key" : "TestActCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestActStateTime",
-                                         "value" : {
-                                            "key" : "TestActStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestActCaseSelected",
-                                         "value" : {
-                                            "key" : "TestActCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestActStateTime",
-                                         "value" : {
-                                            "key" : "TestActStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act2",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Act3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Act3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestActCaseSelected",
-                                         "value" : {
-                                            "key" : "TestActCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestActStateTime",
-                                         "value" : {
-                                            "key" : "TestActStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Act3",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      }, {
-                                         "key" : "Parameter2",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter2"
-                                            },
-                                            "defaultValue" : "DefaultValue2"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide2",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Decide3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Decide3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Decide3",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      }, {
-                                         "key" : "Parameter2",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter2"
-                                            },
-                                            "defaultValue" : "DefaultValue2"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish2",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Establish3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Establish3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Establish3",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match0",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match0",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      }, {
-                                         "key" : "Parameter2",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match0",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter2"
-                                            },
-                                            "defaultValue" : "DefaultValue2"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match1",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match1",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      }, {
-                                         "key" : "Parameter1",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match1",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter1"
-                                            },
-                                            "defaultValue" : "DefaultValue1"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match2",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match2",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match2",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Task_Match3",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Task_Match3",
-                                      "version" : "0.0.1"
-                                   },
-                                   "inputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "outputFields" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   },
-                                   "taskParameters" : {
-                                      "entry" : [ {
-                                         "key" : "Parameter0",
-                                         "value" : {
-                                            "key" : {
-                                               "parentKeyName" : "Task_Match3",
-                                               "parentKeyVersion" : "0.0.1",
-                                               "parentLocalName" : "NULL",
-                                               "localName" : "Parameter0"
-                                            },
-                                            "defaultValue" : "DefaultValue0"
-                                         }
-                                      } ]
-                                   },
-                                   "contextAlbumReference" : [ {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   }, {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   } ],
-                                   "taskLogic" : {
-                                      "key" : "_TaskLogic",
-                                      "logicFlavour" : "JAVASCRIPT",
-                                      "logic" : "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
-                                   }
-                                }
-                             } ]
+                          "value": {
+                            "key": {
+                              "name": "Event0001",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "36b2d570-fff7-3a4b-bab2-6bf492f5129a",
+                            "description": "Generated description for concept referred to by key \"Event0001:0.0.1\""
                           }
-                       },
-                       "events" : {
-                          "key" : {
-                             "name" : "Events",
-                             "version" : "0.0.1"
+                        },
+                        {
+                          "key": {
+                            "name": "Event0002",
+                            "version": "0.0.1"
                           },
-                          "eventMap" : {
-                             "entry" : [ {
-                                "key" : {
-                                   "name" : "Event0000",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0000",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Outside",
-                                   "target" : "Match",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0001",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0001",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Match",
-                                   "target" : "Establish",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0002",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0002",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Establish",
-                                   "target" : "Decide",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0003",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0003",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Decide",
-                                   "target" : "Act",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0004",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0004",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Act",
-                                   "target" : "Outside",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestActCaseSelected",
-                                         "value" : {
-                                            "key" : "TestActCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestActStateTime",
-                                         "value" : {
-                                            "key" : "TestActStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0100",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0100",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Outside",
-                                   "target" : "Match",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0101",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0101",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Match",
-                                   "target" : "Establish",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0102",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0102",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Establish",
-                                   "target" : "Decide",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0103",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0103",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Decide",
-                                   "target" : "Act",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Event0104",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Event0104",
-                                      "version" : "0.0.1"
-                                   },
-                                   "nameSpace" : "org.onap.policy.apex.sample.events",
-                                   "source" : "Act",
-                                   "target" : "Outside",
-                                   "parameter" : {
-                                      "entry" : [ {
-                                         "key" : "TestActCaseSelected",
-                                         "value" : {
-                                            "key" : "TestActCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestActStateTime",
-                                         "value" : {
-                                            "key" : "TestActStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideCaseSelected",
-                                         "value" : {
-                                            "key" : "TestDecideCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestDecideStateTime",
-                                         "value" : {
-                                            "key" : "TestDecideStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishCaseSelected",
-                                         "value" : {
-                                            "key" : "TestEstablishCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestEstablishStateTime",
-                                         "value" : {
-                                            "key" : "TestEstablishStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCase",
-                                         "value" : {
-                                            "key" : "TestMatchCase",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchCaseSelected",
-                                         "value" : {
-                                            "key" : "TestMatchCaseSelected",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestCase",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestMatchStateTime",
-                                         "value" : {
-                                            "key" : "TestMatchStateTime",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestSlogan",
-                                         "value" : {
-                                            "key" : "TestSlogan",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestSlogan",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTemperature",
-                                         "value" : {
-                                            "key" : "TestTemperature",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTemperature",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      }, {
-                                         "key" : "TestTimestamp",
-                                         "value" : {
-                                            "key" : "TestTimestamp",
-                                            "fieldSchemaKey" : {
-                                               "name" : "TestTimestamp",
-                                               "version" : "0.0.1"
-                                            },
-                                            "optional" : false
-                                         }
-                                      } ]
-                                   }
-                                }
-                             } ]
+                          "value": {
+                            "key": {
+                              "name": "Event0002",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "ff6160a7-fb5e-379c-a6d2-2cd28053eacf",
+                            "description": "Generated description for concept referred to by key \"Event0002:0.0.1\""
                           }
-                       },
-                       "albums" : {
-                          "key" : {
-                             "name" : "Context",
-                             "version" : "0.0.1"
+                        },
+                        {
+                          "key": {
+                            "name": "Event0003",
+                            "version": "0.0.1"
                           },
-                          "albums" : {
-                             "entry" : [ {
-                                "key" : {
-                                   "name" : "ExternalContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "ExternalContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "scope" : "EXTERNAL",
-                                   "isWritable" : false,
-                                   "itemSchema" : {
-                                      "name" : "TestExternalContextItem",
-                                      "version" : "0.0.1"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "GlobalContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "GlobalContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "scope" : "GLOBAL",
-                                   "isWritable" : true,
-                                   "itemSchema" : {
-                                      "name" : "TestGlobalContextItem",
-                                      "version" : "0.0.1"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy0ContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policy0ContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "scope" : "APPLICATION",
-                                   "isWritable" : true,
-                                   "itemSchema" : {
-                                      "name" : "TestPolicyContextItem",
-                                      "version" : "0.0.1"
-                                   }
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "Policy1ContextAlbum",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "Policy1ContextAlbum",
-                                      "version" : "0.0.1"
-                                   },
-                                   "scope" : "APPLICATION",
-                                   "isWritable" : true,
-                                   "itemSchema" : {
-                                      "name" : "TestPolicyContextItem",
-                                      "version" : "0.0.1"
-                                   }
-                                }
-                             } ]
+                          "value": {
+                            "key": {
+                              "name": "Event0003",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "5899e216-2abf-3781-abc4-2c257b92721e",
+                            "description": "Generated description for concept referred to by key \"Event0003:0.0.1\""
                           }
-                       },
-                       "schemas" : {
-                          "key" : {
-                             "name" : "TestDatatypes",
-                             "version" : "0.0.1"
+                        },
+                        {
+                          "key": {
+                            "name": "Event0004",
+                            "version": "0.0.1"
                           },
-                          "schemas" : {
-                             "entry" : [ {
-                                "key" : {
-                                   "name" : "TestCase",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestCase",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "java.lang.Byte"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem000",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem000",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem000"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem001",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem001",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem001"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem002",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem002",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem002"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem003",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem003",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem003"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem004",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem004",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem004"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem005",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem005",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem005"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem006",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem006",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem006"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem007",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem007",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem007"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem008",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem008",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem008"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem009",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem009",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem009"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem00A",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem00A",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem00A"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem00B",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem00B",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem00B"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestContextItem00C",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestContextItem00C",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestContextItem00C"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestExternalContextItem",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestExternalContextItem",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestExternalContextItem"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestGlobalContextItem",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestGlobalContextItem",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestGlobalContextItem"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestPolicyContextItem",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestPolicyContextItem",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "org.onap.policy.apex.context.test.concepts.TestPolicyContextItem"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestSlogan",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestSlogan",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "java.lang.String"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestTemperature",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestTemperature",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "java.lang.Double"
-                                }
-                             }, {
-                                "key" : {
-                                   "name" : "TestTimestamp",
-                                   "version" : "0.0.1"
-                                },
-                                "value" : {
-                                   "key" : {
-                                      "name" : "TestTimestamp",
-                                      "version" : "0.0.1"
-                                   },
-                                   "schemaFlavour" : "Java",
-                                   "schemaDefinition" : "java.lang.Long"
-                                }
-                             } ]
+                          "value": {
+                            "key": {
+                              "name": "Event0004",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "7c2692a7-4587-3d09-abf9-d96b339a316f",
+                            "description": "Generated description for concept referred to by key \"Event0004:0.0.1\""
                           }
-                       }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0100",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0100",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "b696048c-c0b0-34c1-8dbe-32ab6c8bc0c7",
+                            "description": "Generated description for concept referred to by key \"Event0100:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0101",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0101",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "edbfa868-2ab2-30fd-8078-4c7f67ca6122",
+                            "description": "Generated description for concept referred to by key \"Event0101:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0102",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0102",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "6b6ad2ff-ef63-3f7b-aabb-fba44f8de9d4",
+                            "description": "Generated description for concept referred to by key \"Event0102:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0103",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0103",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "c2550912-10d9-3000-8826-377288cd6cb1",
+                            "description": "Generated description for concept referred to by key \"Event0103:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0104",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0104",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "f6d75b71-c8a7-3337-a121-88d68c389f5a",
+                            "description": "Generated description for concept referred to by key \"Event0104:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Events",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Events",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "0215644c-4531-375c-8335-d558b4de8c03",
+                            "description": "Generated description for concept referred to by key \"Events:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "ExternalContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "ExternalContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "976a79e7-5c80-3c03-9503-da3f41fec395",
+                            "description": "Generated description for concept referred to by key \"ExternalContextAlbum:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "GlobalContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "GlobalContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "c95e9e5f-d2c7-3ac7-a205-ea3574530cb7",
+                            "description": "Generated description for concept referred to by key \"GlobalContextAlbum:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "KeyInformation",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "KeyInformation",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "1ff2f905-685c-3caf-95bc-0bbc90345888",
+                            "description": "Generated description for concept referred to by key \"KeyInformation:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policies",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policies",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "f54c3b2b-be76-31c4-adfc-87c494c06808",
+                            "description": "Generated description for concept referred to by key \"Policies:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policy0",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "3410e939-30ca-32c4-a2d8-c30b6fee6eec",
+                            "description": "Generated description for concept referred to by key \"Policy0:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy0ContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policy0ContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "e27564c4-3cbf-3db2-9bf3-83ae80a2f907",
+                            "description": "Generated description for concept referred to by key \"Policy0ContextAlbum:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policy1",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "d0b2b585-f344-33b8-af9e-250e7f4cfbce",
+                            "description": "Generated description for concept referred to by key \"Policy1:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy1ContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policy1ContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "815d74ae-6fc0-3221-87b9-2bb1dfdfa7f0",
+                            "description": "Generated description for concept referred to by key \"Policy1ContextAlbum:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "SamplePolicyModelJAVASCRIPT",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "SamplePolicyModelJAVASCRIPT",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "bc8ee312-81ce-3c4a-92d5-4a73b8077148",
+                            "description": "Generated description for concept referred to by key \"SamplePolicyModelJAVASCRIPT:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act0",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "0589ff20-adcc-3ce5-95fe-8d7978ed54ed",
+                            "description": "Generated description for concept referred to by key \"Task_Act0:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act1",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "095b126d-ca8b-32c9-ad52-d744e817a79c",
+                            "description": "Generated description for concept referred to by key \"Task_Act1:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act2",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "3d786b4c-d9ee-3367-ab71-c67271a4ea2f",
+                            "description": "Generated description for concept referred to by key \"Task_Act2:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act3",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "9231753e-20c5-3436-982f-9100340cc570",
+                            "description": "Generated description for concept referred to by key \"Task_Act3:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide0",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "502383d3-483f-3a56-a426-2f0406674c8d",
+                            "description": "Generated description for concept referred to by key \"Task_Decide0:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide1",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "16598106-41c8-3b5a-99c6-5fcf6d1a5ddf",
+                            "description": "Generated description for concept referred to by key \"Task_Decide1:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide2",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "ad3a89f5-e369-3c66-b22c-669f7b3653b8",
+                            "description": "Generated description for concept referred to by key \"Task_Decide2:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide3",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "56815939-1164-3867-9ed1-0a27ff8aafb3",
+                            "description": "Generated description for concept referred to by key \"Task_Decide3:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish0",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "0db0c566-ecd7-3e27-9865-4b82c893abdb",
+                            "description": "Generated description for concept referred to by key \"Task_Establish0:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish1",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "6944a4c1-6201-317c-8d7e-eaa7f2ee0ea0",
+                            "description": "Generated description for concept referred to by key \"Task_Establish1:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish2",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "0f766ea9-11cd-3e7d-a8c8-28c8dee6a85a",
+                            "description": "Generated description for concept referred to by key \"Task_Establish2:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish3",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "c3237a38-cc6d-3418-b1e1-0dc8b4bdcc66",
+                            "description": "Generated description for concept referred to by key \"Task_Establish3:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match0",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "051bcfd5-cf73-3c89-8ee7-ea6e005ec059",
+                            "description": "Generated description for concept referred to by key \"Task_Match0:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match1",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "3754fe19-98f2-34a1-9f45-db31052208d8",
+                            "description": "Generated description for concept referred to by key \"Task_Match1:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match2",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "8c200709-a180-3c8b-916f-275ff49ce194",
+                            "description": "Generated description for concept referred to by key \"Task_Match2:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match3",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "a1a879c6-4510-33b0-bbd0-ad6256189a37",
+                            "description": "Generated description for concept referred to by key \"Task_Match3:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Tasks",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Tasks",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "a7fab96b-ce1c-37ce-bbb2-556b6db524a5",
+                            "description": "Generated description for concept referred to by key \"Tasks:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestCase",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestCase",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "0a652886-c88d-3f8c-8994-ae9161e7c963",
+                            "description": "Generated description for concept referred to by key \"TestCase:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem000",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem000",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "8efba9fa-371e-33df-a7d6-88b0284e7fd0",
+                            "description": "Generated description for concept referred to by key \"TestContextItem000:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem001",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem001",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "3740077c-a2b3-356b-81dc-5ded2118a951",
+                            "description": "Generated description for concept referred to by key \"TestContextItem001:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem002",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem002",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "b5c7df95-9af5-322f-9ea8-eb440a2bf926",
+                            "description": "Generated description for concept referred to by key \"TestContextItem002:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem003",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem003",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "b36f0aa5-0fb9-3e2c-8fa2-fddb7fd05f4b",
+                            "description": "Generated description for concept referred to by key \"TestContextItem003:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem004",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem004",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "093cda11-eaeb-3a46-a5b6-d5e30c00935b",
+                            "description": "Generated description for concept referred to by key \"TestContextItem004:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem005",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem005",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "569a758d-ba40-37c0-aebb-7ad138df25ac",
+                            "description": "Generated description for concept referred to by key \"TestContextItem005:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem006",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem006",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "252818d9-b61f-3962-a905-8865fb00fb04",
+                            "description": "Generated description for concept referred to by key \"TestContextItem006:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem007",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem007",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "fe1a5f7c-c083-377b-a797-752b01fc6c73",
+                            "description": "Generated description for concept referred to by key \"TestContextItem007:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem008",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem008",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "aa87d007-d07e-3f67-8c6d-0ebc3d85479d",
+                            "description": "Generated description for concept referred to by key \"TestContextItem008:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem009",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem009",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "126e7a3a-11b6-3f88-9397-c21d8819f859",
+                            "description": "Generated description for concept referred to by key \"TestContextItem009:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem00A",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem00A",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "0e0e3dec-e03d-3379-a87b-1ecd4aa3d8cc",
+                            "description": "Generated description for concept referred to by key \"TestContextItem00A:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem00B",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem00B",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "dbdc98df-3ff4-360c-b8d3-a7a836ac3de6",
+                            "description": "Generated description for concept referred to by key \"TestContextItem00B:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem00C",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem00C",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "32a2f355-77f3-3b25-ace6-7a9c5763a5ad",
+                            "description": "Generated description for concept referred to by key \"TestContextItem00C:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestDatatypes",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestDatatypes",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "3f95472c-973e-30e2-95f1-bf00cbef909a",
+                            "description": "Generated description for concept referred to by key \"TestDatatypes:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestExternalContextItem",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestExternalContextItem",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "610dbbd4-9149-3b3c-9af4-819056f0e169",
+                            "description": "Generated description for concept referred to by key \"TestExternalContextItem:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestGlobalContextItem",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestGlobalContextItem",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "07fa8f68-55f1-3fd0-81c1-749a379753a7",
+                            "description": "Generated description for concept referred to by key \"TestGlobalContextItem:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestPolicyContextItem",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestPolicyContextItem",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "d9c93cd1-539e-35c5-aaec-bb711ceb1251",
+                            "description": "Generated description for concept referred to by key \"TestPolicyContextItem:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestSlogan",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestSlogan",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "683fe492-7eae-3ac7-9924-bb7850208d05",
+                            "description": "Generated description for concept referred to by key \"TestSlogan:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestTemperature",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestTemperature",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "bba25b6f-e3cd-3060-9022-4ef3a79f8eb0",
+                            "description": "Generated description for concept referred to by key \"TestTemperature:0.0.1\""
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestTimestamp",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestTimestamp",
+                              "version": "0.0.1"
+                            },
+                            "UUID": "97b73937-c344-33c0-924c-4d26b6449564",
+                            "description": "Generated description for concept referred to by key \"TestTimestamp:0.0.1\""
+                          }
+                        }
+                      ]
                     }
-                },
-                "engineParameters": {
-                  "executorParameters": {
-                    "JAVASCRIPT": {
-                      "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                  },
+                  "policies": {
+                    "key": {
+                      "name": "Policies",
+                      "version": "0.0.1"
+                    },
+                    "policyMap": {
+                      "entry": [
+                        {
+                          "key": {
+                            "name": "Policy0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "policyKey": {
+                              "name": "Policy0",
+                              "version": "0.0.1"
+                            },
+                            "template": "MEDA",
+                            "state": {
+                              "entry": [
+                                {
+                                  "key": "Act",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Act"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0003",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Act_NULL",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0004",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "NULL",
+                                              "parentKeyVersion": "0.0.0",
+                                              "parentLocalName": "NULL",
+                                              "localName": "NULL"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Act1",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Act0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act0_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Act1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act1_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Act2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act2_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Act3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act3_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "key": "Decide",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Decide"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0002",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Decide_Act",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0003",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "NULL",
+                                              "localName": "Act"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "ExternalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "Policy0ContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Decide3",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide0_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide1_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide2_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide3_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "key": "Establish",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Establish"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0001",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Establish_Decide",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0002",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "NULL",
+                                              "localName": "Decide"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "ExternalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "Policy1ContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Establish2",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish0_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish1_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish2_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish3_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "key": "Match",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Match"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0000",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Match_Establish",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0001",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "NULL",
+                                              "localName": "Establish"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "Policy0ContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Match0",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Match0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match0_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Match1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match1_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Match2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match2_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Match3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match3_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy0",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              ]
+                            },
+                            "firstState": "Match"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "policyKey": {
+                              "name": "Policy1",
+                              "version": "0.0.1"
+                            },
+                            "template": "MEDA",
+                            "state": {
+                              "entry": [
+                                {
+                                  "key": "Act",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Act"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0103",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Act_NULL",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0104",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "NULL",
+                                              "parentKeyVersion": "0.0.0",
+                                              "parentLocalName": "NULL",
+                                              "localName": "NULL"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Act0",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Act0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act0_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Act1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act1_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Act2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act2_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Act3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Task_Act3_DIRECT_Act_NULL"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Act",
+                                              "localName": "Act_NULL"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "key": "Decide",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Decide"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0102",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Decide_Act",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0103",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "NULL",
+                                              "localName": "Act"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "ExternalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "Policy1ContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Decide3",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide0_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide1_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide2_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Decide3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Task_Decide3_DIRECT_Decide_Act"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Decide",
+                                              "localName": "Decide_Act"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "key": "Establish",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Establish"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0101",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Establish_Decide",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0102",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "NULL",
+                                              "localName": "Decide"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "ExternalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "Policy1ContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Establish1",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish0_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish1_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish2_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Establish3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Task_Establish3_DIRECT_Establish_Decide"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Establish",
+                                              "localName": "Establish_Decide"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "key": "Match",
+                                  "value": {
+                                    "stateKey": {
+                                      "parentKeyName": "Policy1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Match"
+                                    },
+                                    "trigger": {
+                                      "name": "Event0100",
+                                      "version": "0.0.1"
+                                    },
+                                    "stateOutputs": {
+                                      "entry": [
+                                        {
+                                          "key": "Match_Establish",
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            },
+                                            "outgoingEvent": {
+                                              "name": "Event0101",
+                                              "version": "0.0.1"
+                                            },
+                                            "nextState": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "NULL",
+                                              "localName": "Establish"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "contextAlbumReference": [
+                                      {
+                                        "name": "ExternalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "GlobalContextAlbum",
+                                        "version": "0.0.1"
+                                      },
+                                      {
+                                        "name": "Policy1ContextAlbum",
+                                        "version": "0.0.1"
+                                      }
+                                    ],
+                                    "taskSelectionLogic": {
+                                      "key": "TaskSelectionLigic",
+                                      "logicFlavour": "JAVASCRIPT",
+                                      "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.subject.defaultTaskKey.copyTo(executor.selectedTask)\n\nvar returnValue = executor.isTrue;"
+                                    },
+                                    "stateFinalizerLogicMap": {
+                                      "entry": []
+                                    },
+                                    "defaultTask": {
+                                      "name": "Task_Match3",
+                                      "version": "0.0.1"
+                                    },
+                                    "taskReferences": {
+                                      "entry": [
+                                        {
+                                          "key": {
+                                            "name": "Task_Match0",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match0_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Match1",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match1_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Match2",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match2_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "key": {
+                                            "name": "Task_Match3",
+                                            "version": "0.0.1"
+                                          },
+                                          "value": {
+                                            "key": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Task_Match3_DIRECT_Match_Establish"
+                                            },
+                                            "outputType": "DIRECT",
+                                            "output": {
+                                              "parentKeyName": "Policy1",
+                                              "parentKeyVersion": "0.0.1",
+                                              "parentLocalName": "Match",
+                                              "localName": "Match_Establish"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              ]
+                            },
+                            "firstState": "Match"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  "tasks": {
+                    "key": {
+                      "name": "Tasks",
+                      "version": "0.0.1"
+                    },
+                    "taskMap": {
+                      "entry": [
+                        {
+                          "key": {
+                            "name": "Task_Act0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act0",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestActCaseSelected",
+                                  "value": {
+                                    "key": "TestActCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestActStateTime",
+                                  "value": {
+                                    "key": "TestActStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter2",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter2"
+                                    },
+                                    "defaultValue": "DefaultValue2"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act1",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestActCaseSelected",
+                                  "value": {
+                                    "key": "TestActCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestActStateTime",
+                                  "value": {
+                                    "key": "TestActStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act2",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestActCaseSelected",
+                                  "value": {
+                                    "key": "TestActCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestActStateTime",
+                                  "value": {
+                                    "key": "TestActStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act2",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Act3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Act3",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestActCaseSelected",
+                                  "value": {
+                                    "key": "TestActCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestActStateTime",
+                                  "value": {
+                                    "key": "TestActStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Act3",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestActCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestActStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide0",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter2",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter2"
+                                    },
+                                    "defaultValue": "DefaultValue2"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide1",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide2",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide2",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Decide3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Decide3",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Decide3",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestDecideCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestDecideStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish0",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter2",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter2"
+                                    },
+                                    "defaultValue": "DefaultValue2"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish1",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish2",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish2",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Establish3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Establish3",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Establish3",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestEstablishCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestEstablishStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match0",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match0",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter2",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match0",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter2"
+                                    },
+                                    "defaultValue": "DefaultValue2"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(2));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match1",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match1",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                },
+                                {
+                                  "key": "Parameter1",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match1",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter1"
+                                    },
+                                    "defaultValue": "DefaultValue1"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy0ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(3));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match2",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match2",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match2",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "Policy1ContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(0));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Task_Match3",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Task_Match3",
+                              "version": "0.0.1"
+                            },
+                            "inputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "outputFields": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            },
+                            "taskParameters": {
+                              "entry": [
+                                {
+                                  "key": "Parameter0",
+                                  "value": {
+                                    "key": {
+                                      "parentKeyName": "Task_Match3",
+                                      "parentKeyVersion": "0.0.1",
+                                      "parentLocalName": "NULL",
+                                      "localName": "Parameter0"
+                                    },
+                                    "defaultValue": "DefaultValue0"
+                                  }
+                                }
+                              ]
+                            },
+                            "contextAlbumReference": [
+                              {
+                                "name": "ExternalContextAlbum",
+                                "version": "0.0.1"
+                              },
+                              {
+                                "name": "GlobalContextAlbum",
+                                "version": "0.0.1"
+                              }
+                            ],
+                            "taskLogic": {
+                              "key": "_TaskLogic",
+                              "logicFlavour": "JAVASCRIPT",
+                              "logic": "/*\n * ============LICENSE_START=======================================================\n *  Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.debug(executor.subject.id);\nvar gc = executor.getContextAlbum(\"GlobalContextAlbum\");\nexecutor.logger.debug(gc.name);\nexecutor.logger.debug(executor.inFields);\n\nvar caseSelectedType = Java.type(\"java.lang.Byte\");\nexecutor.outFields.put(\"TestMatchCaseSelected\", new caseSelectedType(1));\n\nvar JavaDate = Java.type(\"java.util.Date\");\ntimeNow = new JavaDate();\nexecutor.outFields.put(\"TestMatchStateTime\", timeNow.getTime());\nexecutor.logger.debug(executor.eo);\n\nvar returnValue = executor.isTrue;"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  "events": {
+                    "key": {
+                      "name": "Events",
+                      "version": "0.0.1"
+                    },
+                    "eventMap": {
+                      "entry": [
+                        {
+                          "key": {
+                            "name": "Event0000",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0000",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Outside",
+                            "target": "Match",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0001",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0001",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Match",
+                            "target": "Establish",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0002",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0002",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Establish",
+                            "target": "Decide",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0003",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0003",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Decide",
+                            "target": "Act",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0004",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0004",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Act",
+                            "target": "Outside",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestActCaseSelected",
+                                  "value": {
+                                    "key": "TestActCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestActStateTime",
+                                  "value": {
+                                    "key": "TestActStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0100",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0100",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Outside",
+                            "target": "Match",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0101",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0101",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Match",
+                            "target": "Establish",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0102",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0102",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Establish",
+                            "target": "Decide",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0103",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0103",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Decide",
+                            "target": "Act",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Event0104",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Event0104",
+                              "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.sample.events",
+                            "source": "Act",
+                            "target": "Outside",
+                            "parameter": {
+                              "entry": [
+                                {
+                                  "key": "TestActCaseSelected",
+                                  "value": {
+                                    "key": "TestActCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestActStateTime",
+                                  "value": {
+                                    "key": "TestActStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideCaseSelected",
+                                  "value": {
+                                    "key": "TestDecideCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestDecideStateTime",
+                                  "value": {
+                                    "key": "TestDecideStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishCaseSelected",
+                                  "value": {
+                                    "key": "TestEstablishCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestEstablishStateTime",
+                                  "value": {
+                                    "key": "TestEstablishStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCase",
+                                  "value": {
+                                    "key": "TestMatchCase",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchCaseSelected",
+                                  "value": {
+                                    "key": "TestMatchCaseSelected",
+                                    "fieldSchemaKey": {
+                                      "name": "TestCase",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestMatchStateTime",
+                                  "value": {
+                                    "key": "TestMatchStateTime",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestSlogan",
+                                  "value": {
+                                    "key": "TestSlogan",
+                                    "fieldSchemaKey": {
+                                      "name": "TestSlogan",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTemperature",
+                                  "value": {
+                                    "key": "TestTemperature",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTemperature",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                },
+                                {
+                                  "key": "TestTimestamp",
+                                  "value": {
+                                    "key": "TestTimestamp",
+                                    "fieldSchemaKey": {
+                                      "name": "TestTimestamp",
+                                      "version": "0.0.1"
+                                    },
+                                    "optional": false
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  "albums": {
+                    "key": {
+                      "name": "Context",
+                      "version": "0.0.1"
+                    },
+                    "albums": {
+                      "entry": [
+                        {
+                          "key": {
+                            "name": "ExternalContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "ExternalContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "scope": "EXTERNAL",
+                            "isWritable": false,
+                            "itemSchema": {
+                              "name": "TestExternalContextItem",
+                              "version": "0.0.1"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "GlobalContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "GlobalContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "scope": "GLOBAL",
+                            "isWritable": true,
+                            "itemSchema": {
+                              "name": "TestGlobalContextItem",
+                              "version": "0.0.1"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy0ContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policy0ContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "scope": "APPLICATION",
+                            "isWritable": true,
+                            "itemSchema": {
+                              "name": "TestPolicyContextItem",
+                              "version": "0.0.1"
+                            }
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "Policy1ContextAlbum",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "Policy1ContextAlbum",
+                              "version": "0.0.1"
+                            },
+                            "scope": "APPLICATION",
+                            "isWritable": true,
+                            "itemSchema": {
+                              "name": "TestPolicyContextItem",
+                              "version": "0.0.1"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  "schemas": {
+                    "key": {
+                      "name": "TestDatatypes",
+                      "version": "0.0.1"
+                    },
+                    "schemas": {
+                      "entry": [
+                        {
+                          "key": {
+                            "name": "TestCase",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestCase",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "java.lang.Byte"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem000",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem000",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem000"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem001",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem001",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem001"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem002",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem002",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem002"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem003",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem003",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem003"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem004",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem004",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem004"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem005",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem005",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem005"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem006",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem006",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem006"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem007",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem007",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem007"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem008",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem008",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem008"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem009",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem009",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem009"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem00A",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem00A",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem00A"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem00B",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem00B",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem00B"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestContextItem00C",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestContextItem00C",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestContextItem00C"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestExternalContextItem",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestExternalContextItem",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestExternalContextItem"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestGlobalContextItem",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestGlobalContextItem",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestGlobalContextItem"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestPolicyContextItem",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestPolicyContextItem",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.context.test.concepts.TestPolicyContextItem"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestSlogan",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestSlogan",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "java.lang.String"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestTemperature",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestTemperature",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "java.lang.Double"
+                          }
+                        },
+                        {
+                          "key": {
+                            "name": "TestTimestamp",
+                            "version": "0.0.1"
+                          },
+                          "value": {
+                            "key": {
+                              "name": "TestTimestamp",
+                              "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "java.lang.Long"
+                          }
+                        }
+                      ]
                     }
                   }
                 }
               },
-              "eventInputParameters": {
-                "FirstConsumer": {
-                  "carrierTechnologyParameters": {
-                    "carrierTechnology": "RESTSERVER",
-                    "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
-                    "parameters": {
-                      "standalone": true,
-                      "host": "0.0.0.0",
-                      "port": 23324
-                    }
-                  },
-                  "eventProtocolParameters": {
-                    "eventProtocol": "JSON"
-                  },
-                  "synchronousMode": true,
-                  "synchronousPeer": "FirstProducer",
-                  "synchronousTimeout": 2000
+              "engineParameters": {
+                "executorParameters": {
+                  "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                  }
                 }
-              },
-              "eventOutputParameters": {
-                "FirstProducer": {
-                  "carrierTechnologyParameters": {
-                    "carrierTechnology": "RESTSERVER",
-                    "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
-                  },
-                  "eventProtocolParameters": {
-                    "eventProtocol": "JSON"
-                  },
-                  "synchronousMode": true,
-                  "synchronousPeer": "FirstConsumer",
-                  "synchronousTimeout": 2000
-                }
+              }
+            },
+            "eventInputParameters": {
+              "FirstConsumer": {
+                "carrierTechnologyParameters": {
+                  "carrierTechnology": "RESTSERVER",
+                  "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                  "parameters": {
+                    "standalone": true,
+                    "host": "0.0.0.0",
+                    "port": 23324
+                  }
+                },
+                "eventProtocolParameters": {
+                  "eventProtocol": "JSON"
+                },
+                "synchronousMode": true,
+                "synchronousPeer": "FirstProducer",
+                "synchronousTimeout": 2000
+              }
+            },
+            "eventOutputParameters": {
+              "FirstProducer": {
+                "carrierTechnologyParameters": {
+                  "carrierTechnology": "RESTSERVER",
+                  "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+                },
+                "eventProtocolParameters": {
+                  "eventProtocol": "JSON"
+                },
+                "synchronousMode": true,
+                "synchronousPeer": "FirstConsumer",
+                "synchronousTimeout": 2000
               }
             }
           }
@@ -6748,4 +7434,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/tests/policy/api/api-test.robot b/tests/policy/api/api-test.robot
index 7f108d0..19aa18a 100644
--- a/tests/policy/api/api-test.robot
+++ b/tests/policy/api/api-test.robot
@@ -7,7 +7,7 @@
 *** Test Cases ***
 Healthcheck
      [Documentation]    Runs Policy Api Health check
-     ${auth}=    Create List    healthcheck    zb!XztG34 
+     ${auth}=    Create List    healthcheck    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -18,7 +18,7 @@
 
 Statistics
      [Documentation]    Runs Policy Api Statistics
-     ${auth}=    Create List    healthcheck    zb!XztG34 
+     ${auth}=    Create List    healthcheck    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -29,7 +29,7 @@
 
 RetrievePolicyTypes
      [Documentation]    Gets Policy Types
-     ${auth}=    Create List    healthcheck    zb!XztG34 
+     ${auth}=    Create List    healthcheck    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -38,10 +38,21 @@
      Should Be Equal As Strings    ${resp.status_code}     200
      Should Be Equal As Strings    ${resp.json()['version']}  1.0.0
 
-CreateTCAPolicyType
-     [Documentation]    Create TCA Policy Type
-     ${auth}=    Create List    healthcheck    zb!XztG34 
-     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json
+CreateTCAPolicyTypeV1
+     [Documentation]    Create TCA Policy Type Version 1
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Post Request   policy  /policy/api/v1/policytypes  data=${postjson}   headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}    406
+
+CreateTCAPolicyTypeV2
+     [Documentation]    Create TCA Policy Type Version 2
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -49,12 +60,12 @@
      Log    Received response from policy ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
      ${postjsonobject}   To Json    ${postjson}
-     Dictionary Should Contain Key    ${resp.json()}	tosca_definitions_version 
-     Dictionary Should Contain Key    ${postjsonobject}	tosca_definitions_version
+     Dictionary Should Contain Key    ${resp.json()}    tosca_definitions_version
+     Dictionary Should Contain Key    ${postjsonobject}    tosca_definitions_version
 
 RetrieveMonitoringPolicyTypes
      [Documentation]    Retrieve Monitoring related Policy Types
-     ${auth}=    Create List    healthcheck    zb!XztG34 
+     ${auth}=    Create List    healthcheck    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -64,10 +75,10 @@
      List Should Contain Value    ${resp.json()['policy_types']}  onap.policies.Monitoring
 
 
-CreateNewMonitoringPolicy
-     [Documentation]    Create a new Monitoring TCA policy
-     ${auth}=    Create List    healthcheck    zb!XztG34 
-     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.json
+CreateNewMonitoringPolicyV1
+     [Documentation]    Create a new Monitoring TCA policy version 1
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -78,10 +89,21 @@
      Dictionary Should Contain Key    ${resp.json()['topology_template']['policies'][0]}  onap.restart.tca
      Dictionary Should Contain Key	${postjsonobject['topology_template']['policies'][0]}  onap.restart.tca
 
-SimpleCreateNewMonitoringPolicy
-     [Documentation]    Create a new Monitoring TCA policiy using simple endpoint
-     ${auth}=    Create List    healthcheck    zb!XztG34 
-     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.json
+SimpleCreateNewMonitoringPolicyV1
+     [Documentation]    Create a new Monitoring TCA policiy version 1 using simple endpoint
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Post Request   policy  /policy/api/v1/policies  data=${postjson}   headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}    406
+
+SimpleCreateNewMonitoringPolicyV2
+     [Documentation]    Create a new Monitoring TCA policiy version 2 using simple endpoint
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v2.json
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -95,7 +117,7 @@
 RetrievePoliciesOfType
      [Documentation]    Retrieve all Policies Created for a specific Policy Type
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${expjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.json
+     ${expjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -106,8 +128,8 @@
      Dictionary Should Contain Key    ${resp.json()['topology_template']['policies'][0]}  onap.restart.tca
      Dictionary Should Contain Key	${expjsonobject['topology_template']['policies'][0]}  onap.restart.tca
 
-DeleteSpecificPolicy
-     [Documentation]    Delete Policy of a Type
+DeleteSpecificPolicyV1
+     [Documentation]    Delete the Monitoring Policy Version 1 of the TCA Policy Type
      ${auth}=    Create List    healthcheck    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
@@ -117,3 +139,39 @@
      Should Be Equal As Strings    ${resp.status_code}     200
      ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0     headers=${headers}
      Should Be Equal As Strings    ${resp.status_code}     404
+
+DeleteSpecificPolicyV2
+     [Documentation]    Delete the Monitoring Policy Version 2 of the TCA Policy Type
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/2.0.0     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/2.0.0     headers=${headers}
+     Should Be Equal As Strings    ${resp.status_code}     404
+
+DeleteSpecificPolicyTypeV1
+     [Documentation]    Delete the TCA Policy Type Version 1
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0    headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0    headers=${headers}
+     Should Be Equal As Strings    ${resp.status_code}     404
+
+DeleteSpecificPolicyTypeV2
+     [Documentation]    Delete the TCA Policy Type Version 2
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/2.0.0    headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/2.0.0    headers=${headers}
+     Should Be Equal As Strings    ${resp.status_code}     404
diff --git a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
similarity index 100%
rename from tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json
rename to tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
diff --git a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json
new file mode 100644
index 0000000..0076e82
--- /dev/null
+++ b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json
@@ -0,0 +1,209 @@
+{
+  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "policy_types": {
+    "onap.policies.monitoring.cdap.tca.hi.lo.app": {
+      "derived_from": "onap.policies.Monitoring",
+      "version": "2.0.0",
+      "properties": {
+        "tca_policy": {
+          "type": "map",
+          "description": "TCA Policy JSON",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.tca_policy"
+          }
+        }
+      }
+    }
+  },
+  "data_types": {
+    "onap.datatypes.monitoring.metricsPerEventName": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "controlLoopSchemaType": {
+          "type": "string",
+          "required": true,
+          "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+          "constraints": [
+            {
+              "valid_values": [
+                "VM",
+                "VNF"
+              ]
+            }
+          ]
+        },
+        "eventName": {
+          "type": "string",
+          "required": true,
+          "description": "Event name to which thresholds need to be applied"
+        },
+        "policyName": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Name"
+        },
+        "policyScope": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope"
+        },
+        "policyVersion": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Version"
+        },
+        "thresholds": {
+          "type": "list",
+          "required": true,
+          "description": "Thresholds associated with eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.thresholds"
+          }
+        }
+      }
+    },
+    "onap.datatypes.monitoring.tca_policy": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "domain": {
+          "type": "string",
+          "required": true,
+          "description": "Domain name to which TCA needs to be applied",
+          "default": "measurementsForVfScaling",
+          "constraints": [
+            {
+              "equal": "measurementsForVfScaling"
+            }
+          ]
+        },
+        "metricsPerEventName": {
+          "type": "list",
+          "required": true,
+          "description": "Contains eventName and threshold details that need to be applied to given eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.metricsPerEventName"
+          }
+        }
+      }
+    },
+    "onap.datatypes.monitoring.thresholds": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "closedLoopControlName": {
+          "type": "string",
+          "required": true,
+          "description": "Closed Loop Control Name associated with the threshold"
+        },
+        "closedLoopEventStatus": {
+          "type": "string",
+          "required": true,
+          "description": "Closed Loop Event Status of the threshold",
+          "constraints": [
+            {
+              "valid_values": [
+                "ONSET",
+                "ABATED"
+              ]
+            }
+          ]
+        },
+        "direction": {
+          "type": "string",
+          "required": true,
+          "description": "Direction of the threshold",
+          "constraints": [
+            {
+              "valid_values": [
+                "LESS",
+                "LESS_OR_EQUAL",
+                "GREATER",
+                "GREATER_OR_EQUAL",
+                "EQUAL"
+              ]
+            }
+          ]
+        },
+        "fieldPath": {
+          "type": "string",
+          "required": true,
+          "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
+          "constraints": [
+            {
+              "valid_values": [
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+              ]
+            }
+          ]
+        },
+        "severity": {
+          "type": "string",
+          "required": true,
+          "description": "Threshold Event Severity",
+          "constraints": [
+            {
+              "valid_values": [
+                "CRITICAL",
+                "MAJOR",
+                "MINOR",
+                "WARNING",
+                "NORMAL"
+              ]
+            }
+          ]
+        },
+        "thresholdValue": {
+          "type": "integer",
+          "required": true,
+          "description": "Threshold value for the field Path inside CEF message"
+        },
+        "version": {
+          "type": "string",
+          "required": true,
+          "description": "Version number associated with the threshold"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.json b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json
similarity index 97%
rename from tests/policy/api/data/vCPE.policy.monitoring.input.tosca.json
rename to tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json
index a8ffe52..56bb18d 100644
--- a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.json
+++ b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json
@@ -6,7 +6,7 @@
                 "onap.restart.tca": {
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
                     "version": "1.0.0",
-		    "type_version": "1.0.0",
+                    "type_version": "1.0.0",
                     "metadata": {
                         "policy-id": "onap.restart.tca"
                     },
diff --git a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.json b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json
similarity index 96%
copy from tests/policy/api/data/vCPE.policy.monitoring.input.tosca.json
copy to tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json
index a8ffe52..371b980 100644
--- a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.json
+++ b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json
@@ -5,8 +5,8 @@
             {
                 "onap.restart.tca": {
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-                    "version": "1.0.0",
-		    "type_version": "1.0.0",
+                    "version": "2.0.0",
+                    "type_version": "1.0.0",
                     "metadata": {
                         "policy-id": "onap.restart.tca"
                     },
diff --git a/tests/policy/xacml-pdp/xacml-pdp-test.robot b/tests/policy/xacml-pdp/xacml-pdp-test.robot
index 8227996..0305af8 100644
--- a/tests/policy/xacml-pdp/xacml-pdp-test.robot
+++ b/tests/policy/xacml-pdp/xacml-pdp-test.robot
@@ -28,7 +28,6 @@
      Should Be Equal As Strings    ${resp.json()['code']}  200
 
 ExecuteXacmlPolicy
-     Wait Until Keyword Succeeds    2 min    5 sec    CreateMonitorPolicyType
      Wait Until Keyword Succeeds    2 min    5 sec    CreateNewMonitorPolicy
      Wait Until Keyword Succeeds    2 min    5 sec    DeployMonitorPolicy
      Wait Until Keyword Succeeds    2 min    10 sec   GetAbbreviatedDecisionResult
@@ -36,20 +35,6 @@
 
 *** Keywords ***
 
-CreateMonitorPolicyType
-     [Documentation]    Create Monitoring Policy Type
-     ${auth}=    Create List    healthcheck    zb!XztG34
-     ${postjson}=  Get file  ${CURDIR}/data/onap.policies.monitoring.cdap.tca.hi.lo.app.json
-     Log    Creating session https://${POLICY_API_IP}:6969
-     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Post Request   policy  /policy/api/v1/policytypes  data=${postjson}   headers=${headers}
-     Log    Received response from policy2 ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     ${postjsonobject}   To Json    ${postjson}
-     Dictionary Should Contain Key    ${resp.json()}    tosca_definitions_version
-     Dictionary Should Contain Key    ${postjsonobject}    tosca_definitions_version
-
 CreateNewMonitorPolicy
      [Documentation]    Create a new Monitoring policy
      ${auth}=    Create List    healthcheck    zb!XztG34
diff --git a/tests/usecases/config-over-netconf/config_over_netconf.robot b/tests/usecases/config-over-netconf/config_over_netconf.robot
index c6e0659..2ba6400 100644
--- a/tests/usecases/config-over-netconf/config_over_netconf.robot
+++ b/tests/usecases/config-over-netconf/config_over_netconf.robot
@@ -7,8 +7,8 @@
 
 *** Variables ***
 ${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
-${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/netopeer2
-${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/netopeer2/yang-ext:mount/mynetconf:netconflist
+${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
+${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
 ${BP_UPLOAD_URL}    /api/v1/execution-service/upload
 ${BP_PROCESS_URL}    /api/v1/execution-service/process
 ${BP_ARCHIVE_PATH}    ${CURDIR}/data/blueprint_archive.zip
diff --git a/tests/usecases/config-over-netconf/data/mount.xml b/tests/usecases/config-over-netconf/data/mount.xml
index 108369b..22053e8 100644
--- a/tests/usecases/config-over-netconf/data/mount.xml
+++ b/tests/usecases/config-over-netconf/data/mount.xml
@@ -1,5 +1,5 @@
 <node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
-  <node-id>netopeer2</node-id>
+  <node-id>pnf-simulator</node-id>
     <key-based xmlns="urn:opendaylight:netconf-node-topology">
    <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL_private_key_0</key-id>
    <username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>