Architecture Sections 2.1 and 2.2

Issue-ID: POLICY-2399 Change-Id: I36b87c94cb7149c3c5e510f3fead88c41d09cec6 Signed-off-by: liamfallon <liam.fallon@est.tech>
author: liamfallon <liam.fallon@est.tech> 2020-04-14 13:42:34 +0100
committer: liamfallon <liam.fallon@est.tech> 2020-04-14 16:20:30 +0100
commit: 1c7c520a656c05949e726bdb40db78e7ca657966 (patch)
tree: cf1644eecb92a904afa11b1a57b7fb6cecfa4118
parent: 94fae9ace91dd0a6611ad163989f027dffe7a758 (diff)
7 files changed, 83 insertions, 80 deletions
diff --git a/docs/architecture/architecture.rst b/docs/architecture/architecture.rst
index b31c371c..5bd061eb 100644
--- a/docs/architecture/architecture.rst
+++ b/docs/architecture/architecture.rst
@@ -116,7 +116,7 @@ The Policy Type Implementation is developed that can configure the maximum downt
 can receive a trigger from the analytics system when the maximum downtime is breached, and that can either request more
 resources, report an issue to a trouble ticketing system, and can log a breach.
 
-VPN Policies are created by specifying values for the properties, triggers, and targets specifed in VPN Policy Type.
+VPN Policies are created by specifying values for the properties, triggers, and targets specified in VPN Policy Type.
 
 In the case of the bank network, the *maximumDowntime* threshold is specified as 5 minutes downtime per year and the
 *mitigationStrategy* is defined as *allocateMoreResources*, and the target is specified as being the bank's VPN service
@@ -234,37 +234,34 @@ The UML class diagram above shows thePolicy Framework Object Model.
 2.2 Policy Design Architecture
 ------------------------------
 
-This section describes the architecture of the model driven system used to develop policy types and to create concrete
+This section describes the architecture of the model driven system used to develop policy types and to create
 policies using policy types. The output of Policy Design is deployment-ready artifacts and Policy metadata in the Policy
 Framework database.
 
-Policies that are expressed via natural language or a model require some development work ahead of time for them to be
-translated into concrete runtime policies. Some Policy Domains will be set up and available in the platform during
+Policy types that are expressed via natural language or a model require an implementation that allows them to be
+translated into runtime policies. Some Policy Type implementations are set up and available in the platform during
 startup such as Control Loop Operational Policy Models, OOF placement Models, DCAE microservice models. Policy type
-implementation logic development is done by an experienced developer.
+implementations can also be loaded and deployed at run time.
 
 2.2.1 Policy Type Design
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 Policy Type Design is the task of creating policy types that capture the generic and vendor independent aspects of a
-policy for a particular domain use case. The policy type implementation specifies the model information, rules, and
-tasks that a policy type requires to generate concrete policies.
+policy for a particular domain use case.
 
-All policy types are specified in a TOSCA service template. Once policy types are defined and created in the system,
+All policy types are specified in TOSCA service templates. Once policy types are defined and created in the system,
 *PolicyDevelopment* manages them and uses them to allow policies to be created from these policy types in a uniform
 way regardless of the domain that the policy type is addressing or the PDP technology that will execute the policy.
 
 A *PolicyTypeImpl* is developed for a policy type for a certain type of PDP (for example XACML oriented for decision
 policies, Drools rules or Apex state machines oriented for ECA policies). While a policy type is implementation
 independent, a policy type implementation for a policy type is specific for the technology of the PDP on which
-policies that use that policy type implementation will execute. Further, the design environment and tool chain for
-a policy type implementation is specific to the technology of the PDP on which policies that use that policy type
-implementation will use.
-
-The *PolicyTypeImpl* implementation (or raw policy) is the specification of the specific rules or tasks, the flow of
-the policy, its internal states and data structures and other relevant information. *A PolicyTypeImpl* can be specific
-to a particular policy type, it can be more general, providing the implementation of a class of policy types, or
-the same policy type may have many implementations.
+policies that use that policy type implementation will execute. A Policy Type may have many implementations. A
+*PolicyTypeImpl* is the specification of the specific rules or tasks, the flow of the policy, its internal states
+and data structures and other relevant information. A *PolicyTypeImpl* can be specific to a particular policy type
+or it can be more general, providing the implementation of a class of policy types. Further, the design environment
+and tool chain for implementing implementations of policy types is specific to the technology of the PDP on which
+the implementation will run.
 
 *PolicyDevelopment* provides the RESTful :ref:`Policy Design API <design-label>`, which allows other components to query
 policy types, Those components can then create policies that specify values for the properties, triggers, and targets
@@ -284,17 +281,12 @@ It is possible to generate policy types using MDD (Model Driven Development) tec
 using a DSL (Domain Specific Language) or a policy specification environment for a particular application domain. For
 example, policy types for specifying SLAs could be expressed in a SLA DSL and policy types for managing SON features
 could be generated from a visual SON management tool. The ONAP Policy framework provides an API that allows tool chains
-to create policy types. SDC uses this approach for generating Policy Types in the Policy Framework, see the
-:ref:`Policy Design and Development <design-label>` page.
-
-The SDC GUI supports several types of policies that can be captured at design time. DCAE micro service configuration
-policies can be onboarded via the DCAE-DS (DCAE Design Studio).
-
+to create policy types, see the :ref:`Policy Design and Development <design-label>` page.
 
 .. image:: images/PolicyTypeDesign.svg
 
-The GUI implementation in another ONAP component such as SDC DCAE-DS uses the *API_User* API to create and edit ONAP
-policy types.
+A GUI implementation in another ONAP component (a *PolicyTypeDesignClient*) may use the *API_User* API to create and
+edit ONAP policy types.
 
 2.2.1.2 Programming Policy Type Implementations
 """""""""""""""""""""""""""""""""""""""""""""""
@@ -321,16 +313,22 @@ file and posted over the policy design API described on the :ref:`Policy Design
 A number of mechanisms for policy creation are supported in ONAP. The process in *PolicyDevelopment* for creating a
 policy is the same for all mechanisms. The most general mechanism for creating a policy is using the RESTful
 *Policy Design API*, which provides a full interface to the policy creation support of *PolicyDevelopment*. This API may
-be exercised directly using utilities such as *curl*. *PolicyDevelopment* provides a command line tool that is a loose
-wrapper around the API. It also provides a general purpose Policy GUI in the ONAP Portal for policy creation, which
-again is a general purpose wrapper around the policy creation API. The Policy GUI can interpret any TOSCA Model that has
-been loaded into it and flexibly presents a GUI for a user to create policies from. The development of these mechanisms
-will be phased over a number of ONAP releases.
+be exercised directly using utilities such as *curl*.
+
+In future releases, the Policy Framework may provide a command line tool that will be a loose wrapper around the API. It
+may also provide a general purpose Policy GUI in the ONAP Portal for policy creation, which again would be a general
+purpose wrapper around the policy creation API. The Policy GUI would interpret any TOSCA Model that has been loaded into
+it and flexibly presents a GUI for a user to create policies from. The development of these mechanisms will be phased
+over a number of ONAP releases.
 
 A number of ONAP components use policy in manners which are specific to their particular needs. The manner in which the
 policy creation process is triggered and the way in which information required to create a policy is specified and
 accessed is specialized for these ONAP components.
 
+For example, *CLAMP* provides a GUI for creation of Control Loop policies, which reads the Policy Type associated
+with a control loop, presents the properties as fields in its GUI, and creates a policy using the property values entered
+by the user.
+
 The following subsections outline the mechanisms for policy creation and modification supported by the ONAP Policy
 Framework.
 
@@ -348,7 +346,7 @@ An *API_User* first gets a reference to and the metadata for the Policy type for
 *API_User* then asks for a reference and the metadata for the policy. *PolicyDevelopment* looks up the policy in the
 database. If the policy already exists, *PolicyDevelopment* reads the artifact and returns the reference of the existing
 policy to the *API_User* with the metadata for the existing policy. If the policy does not exist, *PolicyDevelopment*
-creates and new reference and metadata and returns that to the *API_User*.
+informs the *API_User*.
 
 The *API_User* may now proceed with a policy specification session, where the parameters are set for the policy using
 the policy type specification. Once the *API_User* is happy that the policy is completely and correctly specified, it
@@ -394,10 +392,10 @@ using TOSCA Policy Types.
 
 .. image:: images/ScriptedPolicyDesign.svg
 
-One straightforward way of generating policies from Policy types is to use directives specified in a script file. The
-command line utility is an *API_User*. The script reads directives from a file. For each directive, it reads the policy
-type using the Policy Type API, and uses the parameters of the directive to prepare a TOSCA Policy. It then uses the
-Policy API to create the policy.
+One straightforward way of generating policies from Policy types is to use commands specified in a script file. A
+command line utility such as *curl* is an *API_User*. Commands read policy types using the Policy Type API, parse the
+policy type and uses the properties of the policy type to prepare a TOSCA Policy. It then issues further commands to use
+the Policy API to create policies.
 
 2.2.3 Policy Design Process
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/architecture/images/PolicyDesign.svg b/docs/architecture/images/PolicyDesign.svg
index 79ae900e..f414ca7f 100644
--- a/docs/architecture/images/PolicyDesign.svg
+++ b/docs/architecture/images/PolicyDesign.svg
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="726px" preserveAspectRatio="none" style="width:810px;height:726px;" version="1.1" viewBox="0 0 810 726" width="810px" zoomAndPan="magnify"><defs><filter height="300%" id="f10yhti0u2ghcu" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="105" x="353.5" y="22.9951">Policy Design</text><rect fill="#ADD8E6" height="681.5234" style="stroke: #A80036; stroke-width: 1.0;" width="371" x="422" y="34.2969"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="560.5" y="46.3638">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#f10yhti0u2ghcu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="57" y="419.8594"/><rect fill="#FFFFFF" filter="url(#f10yhti0u2ghcu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="474" y="537.2578"/><rect fill="#FFFFFF" filter="url(#f10yhti0u2ghcu)" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="529" x="13" y="278.3906"/><rect fill="#FFFFFF" height="43.9375" style="stroke: none; stroke-width: 1.0;" width="529" x="13" y="324.6563"/><rect fill="#FFFFFF" filter="url(#f10yhti0u2ghcu)" height="163.6641" style="stroke: #000000; stroke-width: 2.0;" width="786" x="13" y="469.8594"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="62" x2="62" y1="115.7266" y2="650.5234"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="479" x2="479" y1="115.7266" y2="650.5234"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="756" x2="756" y1="115.7266" y2="650.5234"/><rect fill="#FEFECE" filter="url(#f10yhti0u2ghcu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="23" y="80.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="30" y="100.4248">API_User</text><rect fill="#FEFECE" filter="url(#f10yhti0u2ghcu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="23" y="649.5234"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="30" y="669.5186">API_User</text><rect fill="#FEFECE" filter="url(#f10yhti0u2ghcu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="426" y="80.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="433" y="100.4248">PolicyDesign</text><rect fill="#FEFECE" filter="url(#f10yhti0u2ghcu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="426" y="649.5234"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="433" y="669.5186">PolicyDesign</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="723" y="112.4248">PolicyDB</text><path d="M738,63.4297 C738,53.4297 756,53.4297 756,53.4297 C756,53.4297 774,53.4297 774,63.4297 L774,89.4297 C774,99.4297 756,99.4297 756,99.4297 C756,99.4297 738,99.4297 738,89.4297 L738,63.4297 " fill="#FEFECE" filter="url(#f10yhti0u2ghcu)" style="stroke: #000000; stroke-width: 1.5;"/><path d="M738,63.4297 C738,73.4297 756,73.4297 756,73.4297 C756,73.4297 774,73.4297 774,63.4297 " fill="none" style="stroke: #000000; stroke-width: 1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="723" y="662.5186">PolicyDB</text><path d="M738,675.8203 C738,665.8203 756,665.8203 756,665.8203 C756,665.8203 774,665.8203 774,675.8203 L774,701.8203 C774,711.8203 756,711.8203 756,711.8203 C756,711.8203 738,711.8203 738,701.8203 L738,675.8203 " fill="#FEFECE" filter="url(#f10yhti0u2ghcu)" style="stroke: #000000; stroke-width: 1.5;"/><path d="M738,675.8203 C738,685.8203 756,685.8203 756,685.8203 C756,685.8203 774,685.8203 774,675.8203 " fill="none" style="stroke: #000000; stroke-width: 1.5;"/><rect fill="#FFFFFF" filter="url(#f10yhti0u2ghcu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="57" y="419.8594"/><rect fill="#FFFFFF" filter="url(#f10yhti0u2ghcu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="474" y="537.2578"/><polygon fill="#A80036" points="467,142.8594,477,146.8594,467,150.8594,471,146.8594" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="473" y1="146.8594" y2="146.8594"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="69" y="141.7935">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="165" x="82" y="141.7935">Get Policy Type Reference</text><polygon fill="#A80036" points="744,171.9922,754,175.9922,744,179.9922,748,175.9922" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="479" x2="750" y1="175.9922" y2="175.9922"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="486" y="170.9263">2</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="240" x="499" y="170.9263">Get Policy Type Artifact and Metadata</text><polygon fill="#A80036" points="73,201.125,63,205.125,73,209.125,69,205.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="205.125" y2="205.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="79" y="200.0591">3</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="277" x="92" y="200.0591">Return Policy Type Reference and Metadata</text><polygon fill="#A80036" points="467,230.2578,477,234.2578,467,238.2578,471,234.2578" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="473" y1="234.2578" y2="234.2578"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="69" y="229.1919">4</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="224" x="82" y="229.1919">Get Policy Reference and Metadata</text><polygon fill="#A80036" points="744,259.3906,754,263.3906,744,267.3906,748,263.3906" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="479" x2="750" y1="263.3906" y2="263.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="486" y="258.3247">5</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="128" x="499" y="258.3247">Get Policy Metadata</text><path d="M13,278.3906 L77,278.3906 L77,285.3906 L67,295.3906 L13,295.3906 L13,278.3906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="529" x="13" y="278.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="291.4575">alt</text><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="92" y="290.6011">[Policy Artifact exists]</text><polygon fill="#A80036" points="73,312.6563,63,316.6563,73,320.6563,69,316.6563" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="316.6563" y2="316.6563"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="79" y="311.5903">6</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="92" y="311.5903">Return Policy Reference and Metadata</text><line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="542" y1="325.6563" y2="325.6563"/><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="194" x="18" y="335.8667">[Policy Artifact does not exist]</text><polygon fill="#A80036" points="73,356.5938,63,360.5938,73,364.5938,69,360.5938" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="360.5938" y2="360.5938"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="79" y="355.5278">7</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="319" x="92" y="355.5278">Return New Policy Reference and Empty Metadata</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="109" y1="411.8594" y2="411.8594"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="109" x2="109" y1="411.8594" y2="424.8594"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="68" x2="109" y1="424.8594" y2="424.8594"/><polygon fill="#A80036" points="78,420.8594,68,424.8594,78,428.8594,74,424.8594" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="74" y="399.2271">8</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="240" x="87" y="391.6606">Policy Editing and Generation Session</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="223" x="87" y="406.7935">to get Policy Parameters from user</text><path d="M13,469.8594 L90,469.8594 L90,476.8594 L80,486.8594 L13,486.8594 L13,469.8594 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="163.6641" style="stroke: #000000; stroke-width: 2.0;" width="786" x="13" y="469.8594"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="482.9263">loop</text><polygon fill="#A80036" points="467,504.125,477,508.125,467,512.125,471,508.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="473" y1="508.125" y2="508.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="69" y="503.0591">9</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="182" x="82" y="503.0591">Use Policy Type specification</text><polygon fill="#A80036" points="462,533.2578,472,537.2578,462,541.2578,466,537.2578" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="468" y1="537.2578" y2="537.2578"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="18" x="69" y="532.1919">10</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="371" x="91" y="532.1919">Create Policy PolicyDesign --&gt; PolicyDesign : Create Policy</text><polygon fill="#A80036" points="744,592.3906,754,596.3906,744,600.3906,748,596.3906" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="479" x2="750" y1="596.3906" y2="596.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="18" x="486" y="591.3247">11</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="215" x="508" y="591.3247">Save Policy Artifact and Metadata</text><polygon fill="#A80036" points="73,621.5234,63,625.5234,73,629.5234,69,625.5234" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="625.5234" y2="625.5234"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="18" x="79" y="620.4575">12</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="137" x="101" y="620.4575">Policy Creation Result</text><!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="726px" preserveAspectRatio="none" style="width:810px;height:726px;" version="1.1" viewBox="0 0 810 726" width="810px" zoomAndPan="magnify"><defs><filter height="300%" id="f161gndiw7aqf5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="105" x="353.5" y="22.9951">Policy Design</text><rect fill="#ADD8E6" height="681.5234" style="stroke: #A80036; stroke-width: 1.0;" width="371" x="422" y="34.2969"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="560.5" y="46.3638">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#f161gndiw7aqf5)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="57" y="419.5938"/><rect fill="#FFFFFF" filter="url(#f161gndiw7aqf5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="474" y="537.2578"/><rect fill="#FFFFFF" filter="url(#f161gndiw7aqf5)" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="529" x="13" y="278.3906"/><rect fill="#FFFFFF" height="43.9375" style="stroke: none; stroke-width: 1.0;" width="529" x="13" y="324.6563"/><rect fill="#FFFFFF" filter="url(#f161gndiw7aqf5)" height="163.6641" style="stroke: #000000; stroke-width: 2.0;" width="786" x="13" y="469.8594"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="62" x2="62" y1="115.7266" y2="650.5234"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="479" x2="479" y1="115.7266" y2="650.5234"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="756" x2="756" y1="115.7266" y2="650.5234"/><rect fill="#FEFECE" filter="url(#f161gndiw7aqf5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="23" y="80.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="30" y="100.4248">API_User</text><rect fill="#FEFECE" filter="url(#f161gndiw7aqf5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="23" y="649.5234"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="30" y="669.5186">API_User</text><rect fill="#FEFECE" filter="url(#f161gndiw7aqf5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="426" y="80.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="433" y="100.4248">PolicyDesign</text><rect fill="#FEFECE" filter="url(#f161gndiw7aqf5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="426" y="649.5234"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="433" y="669.5186">PolicyDesign</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="723" y="112.4248">PolicyDB</text><path d="M738,63.4297 C738,53.4297 756,53.4297 756,53.4297 C756,53.4297 774,53.4297 774,63.4297 L774,89.4297 C774,99.4297 756,99.4297 756,99.4297 C756,99.4297 738,99.4297 738,89.4297 L738,63.4297 " fill="#FEFECE" filter="url(#f161gndiw7aqf5)" style="stroke: #000000; stroke-width: 1.5;"/><path d="M738,63.4297 C738,73.4297 756,73.4297 756,73.4297 C756,73.4297 774,73.4297 774,63.4297 " fill="none" style="stroke: #000000; stroke-width: 1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="723" y="662.5186">PolicyDB</text><path d="M738,675.8203 C738,665.8203 756,665.8203 756,665.8203 C756,665.8203 774,665.8203 774,675.8203 L774,701.8203 C774,711.8203 756,711.8203 756,711.8203 C756,711.8203 738,711.8203 738,701.8203 L738,675.8203 " fill="#FEFECE" filter="url(#f161gndiw7aqf5)" style="stroke: #000000; stroke-width: 1.5;"/><path d="M738,675.8203 C738,685.8203 756,685.8203 756,685.8203 C756,685.8203 774,685.8203 774,675.8203 " fill="none" style="stroke: #000000; stroke-width: 1.5;"/><rect fill="#FFFFFF" filter="url(#f161gndiw7aqf5)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="57" y="419.5938"/><rect fill="#FFFFFF" filter="url(#f161gndiw7aqf5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="474" y="537.2578"/><polygon fill="#A80036" points="467,142.8594,477,146.8594,467,150.8594,471,146.8594" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="473" y1="146.8594" y2="146.8594"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="69" y="141.7935">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="165" x="82" y="141.7935">Get Policy Type Reference</text><polygon fill="#A80036" points="744,171.9922,754,175.9922,744,179.9922,748,175.9922" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="479" x2="750" y1="175.9922" y2="175.9922"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="486" y="170.9263">2</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="240" x="499" y="170.9263">Get Policy Type Artifact and Metadata</text><polygon fill="#A80036" points="73,201.125,63,205.125,73,209.125,69,205.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="205.125" y2="205.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="79" y="200.0591">3</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="277" x="92" y="200.0591">Return Policy Type Reference and Metadata</text><polygon fill="#A80036" points="467,230.2578,477,234.2578,467,238.2578,471,234.2578" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="473" y1="234.2578" y2="234.2578"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="69" y="229.1919">4</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="224" x="82" y="229.1919">Get Policy Reference and Metadata</text><polygon fill="#A80036" points="744,259.3906,754,263.3906,744,267.3906,748,263.3906" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="479" x2="750" y1="263.3906" y2="263.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="486" y="258.3247">5</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="128" x="499" y="258.3247">Get Policy Metadata</text><path d="M13,278.3906 L77,278.3906 L77,285.3906 L67,295.3906 L13,295.3906 L13,278.3906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="529" x="13" y="278.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="291.4575">alt</text><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="92" y="290.6011">[Policy Artifact exists]</text><polygon fill="#A80036" points="73,312.6563,63,316.6563,73,320.6563,69,316.6563" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="316.6563" y2="316.6563"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="79" y="311.5903">6</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="92" y="311.5903">Return Policy Reference and Metadata</text><line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="542" y1="325.6563" y2="325.6563"/><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="194" x="18" y="335.8667">[Policy Artifact does not exist]</text><polygon fill="#A80036" points="73,356.5938,63,360.5938,73,364.5938,69,360.5938" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="360.5938" y2="360.5938"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="79" y="355.5278">7</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="152" x="92" y="355.5278">Return Policy Not Found</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="109" y1="411.8594" y2="411.8594"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="109" x2="109" y1="411.8594" y2="424.8594"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="68" x2="109" y1="424.8594" y2="424.8594"/><polygon fill="#A80036" points="78,420.8594,68,424.8594,78,428.8594,74,424.8594" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="74" y="399.2271">8</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="240" x="87" y="391.6606">Policy Editing and Generation Session</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="223" x="87" y="406.7935">to get Policy Parameters from user</text><path d="M13,469.8594 L90,469.8594 L90,476.8594 L80,486.8594 L13,486.8594 L13,469.8594 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="163.6641" style="stroke: #000000; stroke-width: 2.0;" width="786" x="13" y="469.8594"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="482.9263">loop</text><polygon fill="#A80036" points="467,504.125,477,508.125,467,512.125,471,508.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="473" y1="508.125" y2="508.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="69" y="503.0591">9</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="182" x="82" y="503.0591">Use Policy Type specification</text><polygon fill="#A80036" points="462,533.2578,472,537.2578,462,541.2578,466,537.2578" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="62" x2="468" y1="537.2578" y2="537.2578"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="18" x="69" y="532.1919">10</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="371" x="91" y="532.1919">Create Policy PolicyDesign --&gt; PolicyDesign : Create Policy</text><polygon fill="#A80036" points="744,592.3906,754,596.3906,744,600.3906,748,596.3906" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="479" x2="750" y1="596.3906" y2="596.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="18" x="486" y="591.3247">11</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="215" x="508" y="591.3247">Save Policy Artifact and Metadata</text><polygon fill="#A80036" points="73,621.5234,63,625.5234,73,629.5234,69,625.5234" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="67" x2="478" y1="625.5234" y2="625.5234"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="18" x="79" y="620.4575">12</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="137" x="101" y="620.4575">Policy Creation Result</text><!--
 @startuml
+
 title Policy Design
 
 participant API_User
@@ -19,7 +20,7 @@ PolicyDesign - -> PolicyDB : Get Policy Metadata
 alt Policy Artifact exists
   PolicyDesign - -> API_User : Return Policy Reference and Metadata
 else Policy Artifact does not exist
-  PolicyDesign - -> API_User : Return New Policy Reference and Empty Metadata
+  PolicyDesign - -> API_User : Return Policy Not Found
 end
 
 API_User - -> API_User : Policy Editing and Generation Session\nto get Policy Parameters from user
@@ -35,15 +36,17 @@ loop
   PolicyDesign - -> PolicyDB : Save Policy Artifact and Metadata
   PolicyDesign - -> API_User : Policy Creation Result
 end
+
 @enduml
 
-PlantUML version 1.2019.07beta1(Unknown compile time)
+PlantUML version 1.2018.13(Mon Nov 26 13:11:51 AST 2018)
 (GPL source distribution)
-Java Runtime: Java(TM) SE Runtime Environment
-JVM: Java HotSpot(TM) 64-Bit Server VM
-Java Version: 1.7.0_25-b15
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Java Version: 11.0.6+10-post-Ubuntu-1ubuntu119.10.1
 Operating System: Linux
+OS Version: 5.3.0-46-generic
 Default Encoding: UTF-8
 Language: en
-Country: US
+Country: IE
 --></g></svg>
 \ No newline at end of file
diff --git a/docs/architecture/images/PolicyTypeDesign.svg b/docs/architecture/images/PolicyTypeDesign.svg
index fda281c1..be2daf73 100644
--- a/docs/architecture/images/PolicyTypeDesign.svg
+++ b/docs/architecture/images/PolicyTypeDesign.svg
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="482px" preserveAspectRatio="none" style="width:706px;height:482px;" version="1.1" viewBox="0 0 706 482" width="706px" zoomAndPan="magnify"><defs><filter height="300%" id="f1u2ra6ywuerh9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="149" x="279" y="22.9951">Policy Type Design</text><rect fill="#ADD8E6" height="437.0234" style="stroke: #A80036; stroke-width: 1.0;" width="148" x="387" y="34.2969"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="414" y="46.3638">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#f1u2ra6ywuerh9)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="66" y="305.4609"/><rect fill="#FFFFFF" filter="url(#f1u2ra6ywuerh9)" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="528" x="13" y="179.125"/><rect fill="#FFFFFF" height="43.9375" style="stroke: none; stroke-width: 1.0;" width="528" x="13" y="225.3906"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="71" x2="71" y1="88.7266" y2="416.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="461" x2="461" y1="88.7266" y2="416.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="660" x2="660" y1="88.7266" y2="416.7266"/><rect fill="#FEFECE" filter="url(#f1u2ra6ywuerh9)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="23" y="37.1328"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="30" y="58.1328">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="66" x="36" y="74.4297">DCAE_DS</text><rect fill="#FEFECE" filter="url(#f1u2ra6ywuerh9)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="23" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="30" y="436.7266">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="66" x="36" y="453.0234">DCAE_DS</text><rect fill="#FEFECE" filter="url(#f1u2ra6ywuerh9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="391" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="398" y="73.4248">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#f1u2ra6ywuerh9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="391" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="398" y="435.7217">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#f1u2ra6ywuerh9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="621" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="628" y="73.4248">PolicyDB</text><rect fill="#FEFECE" filter="url(#f1u2ra6ywuerh9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="621" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="628" y="435.7217">PolicyDB</text><rect fill="#FFFFFF" filter="url(#f1u2ra6ywuerh9)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="66" y="305.4609"/><polygon fill="#A80036" points="449,115.8594,459,119.8594,449,123.8594,453,119.8594" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="71" x2="455" y1="119.8594" y2="119.8594"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="78" y="114.7935">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="258" x="91" y="114.7935">Get Policy Type Reference and Metadata</text><polygon fill="#A80036" points="648,160.125,658,164.125,648,168.125,652,164.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="461" x2="654" y1="164.125" y2="164.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="468" y="151.4927">2</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="162" x="481" y="143.9263">Get Policy Type Metadata</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="74" x="481" y="159.0591">and Artifact</text><path d="M13,179.125 L77,179.125 L77,186.125 L67,196.125 L13,196.125 L13,179.125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="528" x="13" y="179.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="192.1919">alt</text><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="176" x="92" y="191.3354">[Policy Type Artifact exists]</text><polygon fill="#A80036" points="82,213.3906,72,217.3906,82,221.3906,78,217.3906" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="460" y1="217.3906" y2="217.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="88" y="212.3247">3</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="277" x="101" y="212.3247">Return Policy Type Reference and Metadata</text><line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="541" y1="226.3906" y2="226.3906"/><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="194" x="18" y="236.6011">[Policy Artifact does not exist]</text><polygon fill="#A80036" points="82,257.3281,72,261.3281,82,265.3281,78,261.3281" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="460" y1="261.3281" y2="261.3281"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="88" y="256.2622">4</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="353" x="101" y="256.2622">Return New Policy Type Reference and Empty Metadata</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="297.4609" y2="297.4609"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="297.4609" y2="310.4609"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="310.4609" y2="310.4609"/><polygon fill="#A80036" points="87,306.4609,77,310.4609,87,314.4609,83,310.4609" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="292.395">5</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="274" x="96" y="292.395">Policy Type Editing and Generation Session</text><polygon fill="#A80036" points="449,365.5938,459,369.5938,449,373.5938,453,369.5938" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="71" x2="455" y1="369.5938" y2="369.5938"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="78" y="364.5278">6</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="210" x="91" y="364.5278">Create Policy Type and Metadata</text><polygon fill="#A80036" points="82,394.7266,72,398.7266,82,402.7266,78,398.7266" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="460" y1="398.7266" y2="398.7266"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="88" y="393.6606">7</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="154" x="101" y="393.6606">Policy Generation Result</text><!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="482px" preserveAspectRatio="none" style="width:852px;height:482px;" version="1.1" viewBox="0 0 852 482" width="852px" zoomAndPan="magnify"><defs><filter height="300%" id="f18eiwso4r8kyb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="149" x="352.25" y="22.9951">Policy Type Design</text><rect fill="#ADD8E6" height="437.0234" style="stroke: #A80036; stroke-width: 1.0;" width="148" x="324.5" y="34.2969"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="351.5" y="46.3638">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#f18eiwso4r8kyb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="305.3281"/><rect fill="#FFFFFF" filter="url(#f18eiwso4r8kyb)" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="522" x="318.5" y="179.125"/><rect fill="#FFFFFF" height="43.9375" style="stroke: none; stroke-width: 1.0;" width="522" x="318.5" y="225.3906"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="88.7266" y2="416.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="398.5" x2="398.5" y1="88.7266" y2="416.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="597.5" x2="597.5" y1="88.7266" y2="416.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="788.5" x2="788.5" y1="88.7266" y2="416.7266"/><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="175" x="8" y="37.1328"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="56.5" y="58.1328">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="161" x="15" y="74.4297">PolicyTypeDesignClient</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="175" x="8" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="56.5" y="436.7266">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="161" x="15" y="453.0234">PolicyTypeDesignClient</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="328.5" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="335.5" y="73.4248">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="328.5" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="335.5" y="435.7217">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="558.5" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="565.5" y="73.4248">PolicyDB</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="558.5" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="60" x="565.5" y="435.7217">PolicyDB</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="746.5" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="66" x="753.5" y="73.4248">DCAE_DS</text><rect fill="#FEFECE" filter="url(#f18eiwso4r8kyb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="746.5" y="415.7266"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="66" x="753.5" y="435.7217">DCAE_DS</text><rect fill="#FFFFFF" filter="url(#f18eiwso4r8kyb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="305.3281"/><polygon fill="#A80036" points="386.5,115.8594,396.5,119.8594,386.5,123.8594,390.5,119.8594" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="97.5" x2="392.5" y1="119.8594" y2="119.8594"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="104.5" y="114.7935">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="258" x="117.5" y="114.7935">Get Policy Type Reference and Metadata</text><polygon fill="#A80036" points="585.5,160.125,595.5,164.125,585.5,168.125,589.5,164.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="398.5" x2="591.5" y1="164.125" y2="164.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="405.5" y="151.4927">2</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="162" x="418.5" y="143.9263">Get Policy Type Metadata</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="74" x="418.5" y="159.0591">and Artifact</text><path d="M318.5,179.125 L382.5,179.125 L382.5,186.125 L372.5,196.125 L318.5,196.125 L318.5,179.125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="90.2031" style="stroke: #000000; stroke-width: 2.0;" width="522" x="318.5" y="179.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="333.5" y="192.1919">alt</text><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="176" x="397.5" y="191.3354">[Policy Type Artifact exists]</text><polygon fill="#A80036" points="776.5,213.3906,786.5,217.3906,776.5,221.3906,780.5,217.3906" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="398.5" x2="782.5" y1="217.3906" y2="217.3906"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="405.5" y="212.3247">3</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="277" x="418.5" y="212.3247">Return Policy Type Reference and Metadata</text><line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="318.5" x2="840.5" y1="226.3906" y2="226.3906"/><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="194" x="323.5" y="236.6011">[Policy Artifact does not exist]</text><polygon fill="#A80036" points="776.5,257.3281,786.5,261.3281,776.5,265.3281,780.5,261.3281" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="398.5" x2="782.5" y1="261.3281" y2="261.3281"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="405.5" y="256.2622">4</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="353" x="418.5" y="256.2622">Return New Policy Type Reference and Empty Metadata</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="144.5" y1="297.4609" y2="297.4609"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="144.5" x2="144.5" y1="297.4609" y2="310.4609"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="103.5" x2="144.5" y1="310.4609" y2="310.4609"/><polygon fill="#A80036" points="113.5,306.4609,103.5,310.4609,113.5,314.4609,109.5,310.4609" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="109.5" y="292.395">5</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="274" x="122.5" y="292.395">Policy Type Editing and Generation Session</text><polygon fill="#A80036" points="386.5,365.5938,396.5,369.5938,386.5,373.5938,390.5,369.5938" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="97.5" x2="392.5" y1="369.5938" y2="369.5938"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="104.5" y="364.5278">6</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="210" x="117.5" y="364.5278">Create Policy Type and Metadata</text><polygon fill="#A80036" points="108.5,394.7266,98.5,398.7266,108.5,402.7266,104.5,398.7266" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="397.5" y1="398.7266" y2="398.7266"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="114.5" y="393.6606">7</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="154" x="127.5" y="393.6606">Policy Generation Result</text><!--
 @startuml
+
 title Policy Type Design
 
-participant DCAE_DS <<API_User >>
+participant PolicyTypeDesignClient <<API_User >>
 box "PolicyDesign" #LightBlue
   participant PolicyTypeDesign
 end box
 autonumber
 
-DCAE_DS - -> PolicyTypeDesign : Get Policy Type Reference and Metadata
+PolicyTypeDesignClient - -> PolicyTypeDesign : Get Policy Type Reference and Metadata
 PolicyTypeDesign - -> PolicyDB : Get Policy Type Metadata\nand Artifact
 
 alt Policy Type Artifact exists
@@ -17,22 +18,24 @@ else Policy Artifact does not exist
   PolicyTypeDesign - -> DCAE_DS : Return New Policy Type Reference and Empty Metadata
 end
 
-DCAE_DS - -> DCAE_DS : Policy Type Editing and Generation Session
+PolicyTypeDesignClient - -> PolicyTypeDesignClient : Policy Type Editing and Generation Session
+
+activate PolicyTypeDesignClient
+deactivate PolicyTypeDesignClient
 
-activate DCAE_DS
-deactivate DCAE_DS
+PolicyTypeDesignClient - -> PolicyTypeDesign : Create Policy Type and Metadata
+PolicyTypeDesign - -> PolicyTypeDesignClient : Policy Generation Result
 
-DCAE_DS - -> PolicyTypeDesign : Create Policy Type and Metadata
-PolicyTypeDesign - -> DCAE_DS : Policy Generation Result
 @enduml
 
-PlantUML version 1.2019.07beta1(Unknown compile time)
+PlantUML version 1.2018.13(Mon Nov 26 13:11:51 AST 2018)
 (GPL source distribution)
-Java Runtime: Java(TM) SE Runtime Environment
-JVM: Java HotSpot(TM) 64-Bit Server VM
-Java Version: 1.7.0_25-b15
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Java Version: 11.0.6+10-post-Ubuntu-1ubuntu119.10.1
 Operating System: Linux
+OS Version: 5.3.0-46-generic
 Default Encoding: UTF-8
 Language: en
-Country: US
+Country: IE
 --></g></svg>
 \ No newline at end of file
diff --git a/docs/architecture/images/ScriptedPolicyDesign.svg b/docs/architecture/images/ScriptedPolicyDesign.svg
index e94a4dbb..f0dd6931 100644
--- a/docs/architecture/images/ScriptedPolicyDesign.svg
+++ b/docs/architecture/images/ScriptedPolicyDesign.svg
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="448px" preserveAspectRatio="none" style="width:752px;height:448px;" version="1.1" viewBox="0 0 752 448" width="752px" zoomAndPan="magnify"><defs><filter height="300%" id="f1p7i2pae4gg2k" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="176" x="289.25" y="22.9951">Scripted Policy Design</text><rect fill="#ADD8E6" height="403.0859" style="stroke: #A80036; stroke-width: 1.0;" width="264" x="471.5" y="34.2969"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="556.5" y="46.3638">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#f1p7i2pae4gg2k)" height="274.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="66" y="98.7266"/><rect fill="#FFFFFF" filter="url(#f1p7i2pae4gg2k)" height="260.0625" style="stroke: #000000; stroke-width: 2.0;" width="728.5" x="13" y="105.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="71" x2="71" y1="88.7266" y2="382.7891"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="412.5" x2="412.5" y1="88.7266" y2="382.7891"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="545.5" x2="545.5" y1="88.7266" y2="382.7891"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="678.5" x2="678.5" y1="88.7266" y2="382.7891"/><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="23" y="37.1328"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="30" y="58.1328">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="49.5" y="74.4297">Script</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="23" y="381.7891"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="30" y="402.7891">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="49.5" y="419.0859">Script</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="364.5" y="49.4297"/><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="360.5" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="83" x="367.5" y="73.4248">DirectiveFile</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="364.5" y="381.7891"/><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="360.5" y="385.7891"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="83" x="367.5" y="405.7842">DirectiveFile</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="475.5" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="482.5" y="73.4248">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="475.5" y="381.7891"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="482.5" y="401.7842">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="625.5" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="632.5" y="73.4248">PolicyDesign</text><rect fill="#FEFECE" filter="url(#f1p7i2pae4gg2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="625.5" y="381.7891"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="632.5" y="401.7842">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#f1p7i2pae4gg2k)" height="274.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="66" y="98.7266"/><path d="M13,105.7266 L90,105.7266 L90,112.7266 L80,122.7266 L13,122.7266 L13,105.7266 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="260.0625" style="stroke: #000000; stroke-width: 2.0;" width="728.5" x="13" y="105.7266"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="118.7935">loop</text><polygon fill="#A80036" points="401,139.9922,411,143.9922,401,147.9922,405,143.9922" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="407" y1="143.9922" y2="143.9922"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="138.9263">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="217" x="96" y="138.9263">Read next directive from script file</text><polygon fill="#A80036" points="533.5,169.125,543.5,173.125,533.5,177.125,537.5,173.125" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="539.5" y1="173.125" y2="173.125"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="168.0591">2</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="96" y="168.0591">Read Policy Type for directive</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="202.2578" y2="202.2578"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="202.2578" y2="215.2578"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="215.2578" y2="215.2578"/><polygon fill="#A80036" points="87,211.2578,77,215.2578,87,219.2578,83,215.2578" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="197.1919">3</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="223" x="96" y="197.1919">Prepare TOSCA Policy for coreation</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="244.3906" y2="244.3906"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="244.3906" y2="257.3906"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="257.3906" y2="257.3906"/><polygon fill="#A80036" points="87,253.3906,77,257.3906,87,261.3906,83,257.3906" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="239.3247">4</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="264" x="96" y="239.3247">Read parameters from script file directive</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="286.5234" y2="286.5234"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="286.5234" y2="299.5234"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="299.5234" y2="299.5234"/><polygon fill="#A80036" points="87,295.5234,77,299.5234,87,303.5234,83,299.5234" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="281.4575">5</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="305" x="96" y="281.4575">Set Parameters in TOSCA Policy being prepared</text><polygon fill="#A80036" points="666.5,324.6563,676.5,328.6563,666.5,332.6563,670.5,328.6563" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="672.5" y1="328.6563" y2="328.6563"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="323.5903">6</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="96" y="323.5903">Create Policy</text><polygon fill="#A80036" points="87,353.7891,77,357.7891,87,361.7891,83,357.7891" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="81" x2="677.5" y1="357.7891" y2="357.7891"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="93" y="352.7231">7</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="132" x="106" y="352.7231">Policy creation result</text><!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="419px" preserveAspectRatio="none" style="width:620px;height:419px;" version="1.1" viewBox="0 0 620 419" width="620px" zoomAndPan="magnify"><defs><filter height="300%" id="fa24zahwofl6d" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="176" x="223" y="22.9951">Scripted Policy Design</text><rect fill="#ADD8E6" height="373.9531" style="stroke: #A80036; stroke-width: 1.0;" width="264" x="339" y="34.2969"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="424" y="46.3638">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#fa24zahwofl6d)" height="244.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="66" y="98.7266"/><rect fill="#FFFFFF" filter="url(#fa24zahwofl6d)" height="230.9297" style="stroke: #000000; stroke-width: 2.0;" width="596" x="13" y="105.7266"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="71" x2="71" y1="88.7266" y2="353.6563"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="413" x2="413" y1="88.7266" y2="353.6563"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="546" x2="546" y1="88.7266" y2="353.6563"/><rect fill="#FEFECE" filter="url(#fa24zahwofl6d)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="23" y="37.1328"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="30" y="58.1328">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="49.5" y="74.4297">Script</text><rect fill="#FEFECE" filter="url(#fa24zahwofl6d)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="23" y="352.6563"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="30" y="373.6563">«API_User»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="49.5" y="389.9531">Script</text><rect fill="#FEFECE" filter="url(#fa24zahwofl6d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="343" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="350" y="73.4248">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#fa24zahwofl6d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="343" y="352.6563"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="122" x="350" y="372.6514">PolicyTypeDesign</text><rect fill="#FEFECE" filter="url(#fa24zahwofl6d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="493" y="53.4297"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="500" y="73.4248">PolicyDesign</text><rect fill="#FEFECE" filter="url(#fa24zahwofl6d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="493" y="352.6563"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="88" x="500" y="372.6514">PolicyDesign</text><rect fill="#FFFFFF" filter="url(#fa24zahwofl6d)" height="244.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="66" y="98.7266"/><path d="M13,105.7266 L90,105.7266 L90,112.7266 L80,122.7266 L13,122.7266 L13,105.7266 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="230.9297" style="stroke: #000000; stroke-width: 2.0;" width="596" x="13" y="105.7266"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="118.7935">loop</text><polygon fill="#A80036" points="401,139.9922,411,143.9922,401,147.9922,405,143.9922" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="407" y1="143.9922" y2="143.9922"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="138.9263">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="213" x="96" y="138.9263">Read Policy Type using command</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="173.125" y2="173.125"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="173.125" y2="186.125"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="186.125" y2="186.125"/><polygon fill="#A80036" points="87,182.125,77,186.125,87,190.125,83,186.125" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="168.0591">2</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="215" x="96" y="168.0591">Prepare TOSCA Policy for creation</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="215.2578" y2="215.2578"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="215.2578" y2="228.2578"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="228.2578" y2="228.2578"/><polygon fill="#A80036" points="87,224.2578,77,228.2578,87,232.2578,83,228.2578" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="210.1919">3</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="282" x="96" y="210.1919">Parse parameters from retrieved policy type</text><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="118" y1="257.3906" y2="257.3906"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="118" x2="118" y1="257.3906" y2="270.3906"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="77" x2="118" y1="270.3906" y2="270.3906"/><polygon fill="#A80036" points="87,266.3906,77,270.3906,87,274.3906,83,270.3906" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="252.3247">4</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="305" x="96" y="252.3247">Set Parameters in TOSCA Policy being prepared</text><polygon fill="#A80036" points="534,295.5234,544,299.5234,534,303.5234,538,299.5234" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="540" y1="299.5234" y2="299.5234"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="83" y="294.4575">5</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="190" x="96" y="294.4575">Create Policy using command</text><polygon fill="#A80036" points="87,324.6563,77,328.6563,87,332.6563,83,328.6563" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="81" x2="545" y1="328.6563" y2="328.6563"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="93" y="323.5903">6</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="132" x="106" y="323.5903">Policy creation result</text><!--
 @startuml
+
 title Scripted Policy Design
 
 participant Script <<API_User >>
-collections DirectiveFile
 
 box "PolicyDesign" #LightBlue
   participant PolicyTypeDesign
@@ -15,25 +15,26 @@ autonumber
 activate Script
 
 loop
-  Script - -> DirectiveFile : Read next directive from script file
-  Script - -> PolicyTypeDesign : Read Policy Type for directive
-  Script - -> Script : Prepare TOSCA Policy for coreation
-  Script - -> Script : Read parameters from script file directive
+  Script - -> PolicyTypeDesign : Read Policy Type using command
+  Script - -> Script : Prepare TOSCA Policy for creation
+  Script - -> Script : Parse parameters from retrieved policy type
   Script - -> Script : Set Parameters in TOSCA Policy being prepared
-  Script - -> PolicyDesign : Create Policy
+  Script - -> PolicyDesign : Create Policy using command
   PolicyDesign - -> Script : Policy creation result
 end
 
 deactivate Script
+
 @enduml
 
-PlantUML version 1.2019.07beta1(Unknown compile time)
+PlantUML version 1.2018.13(Mon Nov 26 13:11:51 AST 2018)
 (GPL source distribution)
-Java Runtime: Java(TM) SE Runtime Environment
-JVM: Java HotSpot(TM) 64-Bit Server VM
-Java Version: 1.7.0_25-b15
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Java Version: 11.0.6+10-post-Ubuntu-1ubuntu119.10.1
 Operating System: Linux
+OS Version: 5.3.0-46-generic
 Default Encoding: UTF-8
 Language: en
-Country: US
+Country: IE
 --></g></svg>
 \ No newline at end of file
diff --git a/docs/architecture/plantuml/PolicyDesign.puml b/docs/architecture/plantuml/PolicyDesign.puml
index f844809e..6b4b8020 100644
--- a/docs/architecture/plantuml/PolicyDesign.puml
+++ b/docs/architecture/plantuml/PolicyDesign.puml
@@ -19,7 +19,7 @@ PolicyDesign --> PolicyDB : Get Policy Metadata
 alt Policy Artifact exists
   PolicyDesign --> API_User : Return Policy Reference and Metadata
 else Policy Artifact does not exist
-  PolicyDesign --> API_User : Return New Policy Reference and Empty Metadata
+  PolicyDesign --> API_User : Return Policy Not Found
 end
 
 API_User --> API_User : Policy Editing and Generation Session\nto get Policy Parameters from user
diff --git a/docs/architecture/plantuml/PolicyTypeDesign.puml b/docs/architecture/plantuml/PolicyTypeDesign.puml
index 92d3c0ca..9125ee87 100644
--- a/docs/architecture/plantuml/PolicyTypeDesign.puml
+++ b/docs/architecture/plantuml/PolicyTypeDesign.puml
@@ -2,13 +2,13 @@
 
 title Policy Type Design
 
-participant DCAE_DS <<API_User >>
+participant PolicyTypeDesignClient <<API_User >>
 box "PolicyDesign" #LightBlue
   participant PolicyTypeDesign
 end box
 autonumber
 
-DCAE_DS --> PolicyTypeDesign : Get Policy Type Reference and Metadata
+PolicyTypeDesignClient --> PolicyTypeDesign : Get Policy Type Reference and Metadata
 PolicyTypeDesign --> PolicyDB : Get Policy Type Metadata\nand Artifact
 
 alt Policy Type Artifact exists
@@ -17,12 +17,12 @@ else Policy Artifact does not exist
   PolicyTypeDesign --> DCAE_DS : Return New Policy Type Reference and Empty Metadata
 end
 
-DCAE_DS --> DCAE_DS : Policy Type Editing and Generation Session
+PolicyTypeDesignClient --> PolicyTypeDesignClient : Policy Type Editing and Generation Session
 
-activate DCAE_DS
-deactivate DCAE_DS
+activate PolicyTypeDesignClient
+deactivate PolicyTypeDesignClient
 
-DCAE_DS --> PolicyTypeDesign : Create Policy Type and Metadata
-PolicyTypeDesign --> DCAE_DS : Policy Generation Result
+PolicyTypeDesignClient --> PolicyTypeDesign : Create Policy Type and Metadata
+PolicyTypeDesign --> PolicyTypeDesignClient : Policy Generation Result
 
 @enduml
 \ No newline at end of file
diff --git a/docs/architecture/plantuml/ScriptedPolicyDesign.puml b/docs/architecture/plantuml/ScriptedPolicyDesign.puml
index e9702174..2092a4df 100644
--- a/docs/architecture/plantuml/ScriptedPolicyDesign.puml
+++ b/docs/architecture/plantuml/ScriptedPolicyDesign.puml
@@ -3,7 +3,6 @@
 title Scripted Policy Design
 
 participant Script <<API_User >>
-collections DirectiveFile
 
 box "PolicyDesign" #LightBlue
   participant PolicyTypeDesign
@@ -15,12 +14,11 @@ autonumber
 activate Script
 
 loop
-  Script --> DirectiveFile : Read next directive from script file
-  Script --> PolicyTypeDesign : Read Policy Type for directive
-  Script --> Script : Prepare TOSCA Policy for coreation
-  Script --> Script : Read parameters from script file directive
+  Script --> PolicyTypeDesign : Read Policy Type using command
+  Script --> Script : Prepare TOSCA Policy for creation
+  Script --> Script : Parse parameters from retrieved policy type
   Script --> Script : Set Parameters in TOSCA Policy being prepared
-  Script --> PolicyDesign : Create Policy
+  Script --> PolicyDesign : Create Policy using command
   PolicyDesign --> Script : Policy creation result
 end
author	liamfallon <liam.fallon@est.tech>	2020-04-14 13:42:34 +0100
committer	liamfallon <liam.fallon@est.tech>	2020-04-14 16:20:30 +0100
commit	1c7c520a656c05949e726bdb40db78e7ca657966 (patch)
tree	cf1644eecb92a904afa11b1a57b7fb6cecfa4118
parent	94fae9ace91dd0a6611ad163989f027dffe7a758 (diff)