diff --git a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/Canvas.wrapper.tsx b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/Canvas.wrapper.tsx
index 3bbc0f6..ae0bea7 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/Canvas.wrapper.tsx
+++ b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/Canvas.wrapper.tsx
@@ -61,6 +61,9 @@ export class CanvasWrapper extends React.Component<ICanvasWrapperProps, IState>
   private ref = React.createRef<HTMLElement>();
 
   public componentDidMount () {
+    window.addEventListener('error', function (e) {
+      console.error(e);
+    });
     this.updateSize();
 
     if (this.ref.current) {
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/CanvasOuter.default.tsx b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/CanvasOuter.default.tsx
index 237529b..371188d 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/CanvasOuter.default.tsx
+++ b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/CanvasOuter.default.tsx
@@ -25,6 +25,7 @@ export interface ICanvasOuterDefaultProps {
 
 export const CanvasOuterDefault = styled.div<ICanvasOuterDefaultProps>`
   position: relative;
+  border-radius: 15px;
   background-size: 20px 20px;
   background-color: rgba(0,0,0,0.08);
   background-image:
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/PropertiesPanel.tsx b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/PropertiesPanel.tsx
index 32d8efb..eb35e11 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/PropertiesPanel.tsx
+++ b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/PropertiesPanel.tsx
@@ -15,14 +15,11 @@
  ******************************************************************************************************************** */
 
 //import * as React from 'react';
-import ColumnLayout from '@cloudscape-design/components/column-layout';
-import Form from '@cloudscape-design/components/form';
-import FormField from '@cloudscape-design/components/form-field';
-import Textarea from '@cloudscape-design/components/textarea';
-import Checkbox from '@cloudscape-design/components/checkbox';
+import { ColumnLayout, Form, FormField, Textarea, Checkbox, TagEditor, ExpandableSection, Multiselect } from '@cloudscape-design/components';
+import { dataFeaturesOptions, securityFeaturesOptions, techFeaturesOptions } from './panel-config';
+//import { OptionDefinition } from '@cloudscape-design/components/internal/components/option/interfaces';
 
 export default function PropertiesPanel(props) {
-  //console.log('clickedObjectProperties ', props);
   function handleNameChange(event) {
     props.onChangeName(event.detail.value);
   };
@@ -35,6 +32,18 @@ export default function PropertiesPanel(props) {
   function handleOutOfScopeReasonChange(event) {
     props.onChangeOutOfScopeReason(event.detail.value);
   };
+  function handleTagsChange(event) {
+    props.onChangeTags(event.detail.tags);
+  };
+  function handleDataFeaturesChange(event) {
+    props.onChangeDataFeatures(event.detail.selectedOptions);
+  };
+  function handleTechFeaturesChange(event) {
+    props.onChangeTechFeatures(event.detail.selectedOptions);
+  };
+  function handleSecurityFeaturesChange(event) {
+    props.onChangeSecurityFeatures(event.detail.selectedOptions);
+  };
 
   return (
     <form onSubmit={e => e.preventDefault()} >
@@ -74,10 +83,66 @@ export default function PropertiesPanel(props) {
             <Textarea
               value={props.outOfScopeReason}
               onChange={handleOutOfScopeReasonChange}
-              placeholder="reason for out of scope"
+              placeholder="a kind reminder for future-you"
               rows={2} />
           </FormField>
         </ColumnLayout>
+        <ColumnLayout
+          borders="vertical"
+          columns={3}
+          variant="text-grid" >
+          <Multiselect
+            selectedOptions={props.dataFeatures}
+            onChange={handleDataFeaturesChange}
+            placeholder='Data features that apply to selected component'
+            tokenLimit={3} // number of visible selected options
+            disabled={props.outOfScope}
+            options={dataFeaturesOptions(props.type)}
+          />
+          <Multiselect
+            selectedOptions={props.techFeatures}
+            onChange={handleTechFeaturesChange}
+            placeholder='Tech features that apply to selected component'
+            tokenLimit={3} // number of visible selected options
+            disabled={props.outOfScope}
+            options={techFeaturesOptions(props.type)}
+          />
+          <Multiselect
+            selectedOptions={props.securityFeatures}
+            onChange={handleSecurityFeaturesChange}
+            placeholder='Security features that apply to selected component'
+            tokenLimit={3} // number of visible selected options
+            disabled={props.outOfScope}
+            options={securityFeaturesOptions(props.type)}
+          />
+        </ColumnLayout>
+        <ColumnLayout
+          borders="vertical"
+          columns={1}
+          variant="text-grid" >
+          <ExpandableSection headerText={`Tags (${props.tags?.length || 0})`}>
+            <TagEditor
+              i18nStrings={{
+                tagLimit: (availableTags, tagLimit) =>
+                  availableTags === tagLimit
+                    ? 'You can add up to ' + tagLimit + ' tags.'
+                    : availableTags === 1
+                      ? 'You can add up to 1 more tag.'
+                      : 'You can add up to ' + availableTags + ' more tags.',
+                keyHeader: 'Key',
+                valueHeader: 'Value (optional)',
+                addButton: 'Add new tag',
+                removeButton: 'Remove',
+                keyPlaceholder: 'Enter key',
+                valuePlaceholder: 'Enter value',
+                emptyKeyError: 'You must specify a tag key',
+              }}
+              tags={props.tags}
+              onChange={handleTagsChange}
+              tagLimit={5}
+            />
+          </ExpandableSection>
+        </ColumnLayout>
       </Form>
     </form>
   );
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/panel-config.tsx b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/panel-config.tsx
new file mode 100644
index 0000000..56e4656
--- /dev/null
+++ b/src/components/generic/DiagramCanvas/flowDiagram/components/Canvas/PropertiesPanel/panel-config.tsx
@@ -0,0 +1,384 @@
+/** *******************************************************************************************************************
+  Copyright Amazon.com, Inc. or its affiliates. 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.
+ ******************************************************************************************************************** */
+
+import { SelectProps } from '@cloudscape-design/components';
+
+export function dataFeaturesOptions(objectType: string): SelectProps.Options {
+  return [
+    {
+      label: 'Customer Data',
+      options: [
+        {
+          label: 'Stored',
+          value: 'cd_stored',
+          description: 'This component stores customer data',
+        },
+        {
+          label: 'Processed',
+          value: 'cd_processed',
+          description: 'This component processes customer data',
+        },
+      ],
+    },
+    {
+      label: 'Personal Identifiable Information (PII)',
+      options: [
+        {
+          label: 'Stored',
+          value: 'pii_stored',
+          description: 'This component stores PII',
+        },
+        {
+          label: 'Processed',
+          value: 'pii_processed',
+          description: 'This component processes PII',
+        },
+      ],
+    },
+    {
+      label: 'Logs, credentials, encryption',
+      disabled: objectType === 'end' ? false : true, // enable only for datastores
+      options: [
+        {
+          label: 'Store logs',
+          value: 'lce_store_logs',
+          description: 'This component stores logs',
+        },
+        {
+          label: 'Stores credentials',
+          value: 'lce_store_credentials',
+          description: 'This component stores credentials',
+        },
+        {
+          label: 'Data is signed',
+          value: 'lce_data_signed',
+          description: 'This component digitally signs the data',
+        },
+        {
+          label: 'Data is encrypted at rest',
+          value: 'lce_data_encrypted_at_rest',
+          description: 'This component uses encryption at rest',
+        },
+      ],
+    },
+    {
+      label: 'Data exchange format',
+      disabled: objectType === 'start' || objectType === 'link' ? false : true, // enable only for processes and links (data flows)
+      options: [
+        {
+          label: 'JSON',
+          value: 'df_json',
+          description: 'Text-based data format',
+          labelTag: 'human-readable',
+        },
+        {
+          label: 'XML',
+          value: 'df_xml',
+          description: 'Text-based, partially binary',
+          labelTag: 'human-readable',
+        },
+        {
+          label: 'YAML',
+          value: 'df_yaml',
+          description: 'Text-based data format',
+          labelTag: 'human-readable',
+        },
+        {
+          label: 'CSV',
+          value: 'df_csv',
+          description: 'Text-based data format',
+          labelTag: 'human-readable',
+        },
+        {
+          label: 'Thrift',
+          value: 'df_thrift',
+          description: 'Binary data format',
+        },
+        {
+          label: 'Other',
+          value: 'df_other',
+          description: 'Other dataformat',
+        },
+      ],
+    },
+  ];
+};
+
+export function techFeaturesOptions(objectType: string): SelectProps.Options {
+  return [
+    {
+      label: 'Architecture',
+      disabled: ((objectType==='start') ? false:true), // enable only for processes
+      options: [
+        {
+          label: 'Serverless',
+          value: 'ts_serverless',
+          description: 'This component uses serverless computing',
+        },
+        {
+          label: 'Containers',
+          value: 'ts_containers',
+          description: 'This component uses containers',
+        },
+        {
+          label: 'VMs',
+          value: 'ts_vm',
+          description: 'This component uses VMs',
+        },
+      ],
+    },
+    {
+      label: 'OS and programming languages',
+      disabled: ((objectType==='start') ? false:true), // enable only for processes
+      options: [
+        {
+          label: 'Linux',
+          value: 'os_linux',
+          description: 'This component uses Linux',
+        },
+        {
+          label: 'iOS',
+          value: 'os_ios',
+          description: 'This component uses iOS',
+        },
+        {
+          label: 'Android',
+          value: 'os_android',
+          description: 'This component uses Android',
+        },
+        {
+          label: 'Other OS',
+          value: 'os_other',
+          description: 'This component uses other OS',
+        },
+        {
+          label: 'Java',
+          value: 'lan_java',
+          description: 'This component uses Java',
+        },
+        {
+          label: 'Ruby',
+          value: 'lan_ruby',
+          description: 'This component uses Ruby',
+        },
+        {
+          label: 'Python',
+          value: 'lan_python',
+          description: 'This component uses Python',
+        },
+        {
+          label: 'Javascript',
+          value: 'lan_js',
+          description: 'This component uses Javascript',
+        },
+        {
+          label: 'Other language',
+          value: 'lan_other',
+          description: 'This component uses other language',
+        },
+      ],
+    },
+    {
+      label: 'Data storage and querying',
+      disabled: ((objectType==='end') ? false:true), // enable only for datastores
+      options: [
+        {
+          label: 'MySQL',
+          value: 'dsq_mysql',
+          description: 'This component uses MySQL',
+        },
+        {
+          label: 'MongoDB',
+          value: 'dsq_mongodb',
+          description: 'This component uses MongoDB',
+        },
+        {
+          label: 'Azure SQL Synapse',
+          value: 'dsq_azure',
+          description: 'This component uses Azure SQL Synapse',
+        },
+        {
+          label: 'PostgresSQL',
+          value: 'dsq_postgres',
+          description: 'This component uses PostgresSQL',
+        },
+        {
+          label: 'Redshift',
+          value: 'dsq_redshift',
+          description: 'This component uses Redshift',
+        },
+      ],
+    },
+    {
+      label: 'Backend frameworks',
+      disabled: ((objectType==='start') ? false:true), // enable only for processes and links (data flows)
+      options: [
+        {
+          label: 'Ruby on Rails',
+          value: 'bf_ruby',
+          description: 'This component uses Ruby on Rais',
+        },
+        {
+          label: 'Django',
+          value: 'bf_django',
+          description: 'This component uses Django (Python)',
+        },
+        {
+          label: 'Spring',
+          value: 'bf_spring',
+          description: 'This component uses Spring (Java)',
+        },
+        {
+          label: 'Ruby on .NET',
+          value: 'bf_dotnet',
+          description: 'This component uses .NET',
+        },
+        {
+          label: 'Laravel',
+          value: 'bf_laravel',
+          description: 'This component uses Laravel (PHP)',
+        },
+        {
+          label: 'Other backend framework',
+          value: 'bf_other',
+          description: 'This component uses other backend framework',
+        },
+      ],
+    },
+    {
+      label: 'Frontend frameworks',
+      disabled: ((objectType==='process-point') ? false:true), // enable only for external actors
+      options: [
+        {
+          label: 'React',
+          value: 'ff_react',
+          description: 'This component uses React',
+        },
+        {
+          label: 'jQuery',
+          value: 'ff_jquery',
+          description: 'This component uses jQuery',
+        },
+        {
+          label: 'BackboneJS',
+          value: 'ff_backbone',
+          description: 'This component uses BackboneJS',
+        },
+        {
+          label: 'Vue.js',
+          value: 'ff_vue',
+          description: 'This component uses Vue.js',
+        },
+        {
+          label: 'Angular',
+          value: 'ff_angular',
+          description: 'This component uses Angular',
+        },
+        {
+          label: 'Other frontend framework',
+          value: 'ff_other',
+          description: 'This component uses other frontend framework',
+        },
+      ],
+    },
+    {
+      label: 'Other features',
+      options: [
+        {
+          label: 'Third-party software',
+          value: 'of_3rdparty',
+          description: 'This component uses third-party software',
+        },
+        {
+          label: 'File uploads',
+          value: 'of_file_uploads',
+          description: 'This component implements a file upload feature',
+        },
+        {
+          label: 'Admin dashboard/console',
+          value: 'of_admin_dashboard',
+          description: 'This component implements an admin dashboard',
+        },
+      ],
+    },
+  ];
+};
+
+export function securityFeaturesOptions(objectType: string): SelectProps.Options {
+  return [
+    {
+      label: 'Authentication',
+      disabled: ((objectType==='end' || objectType==='end' || objectType==='start' || objectType==='process-point') ? false:true), // enable only for datastores, processes, external actors
+      options: [
+        {
+          label: 'OpenID',
+          value: 'authn_openid',
+          description: 'This component uses OpenID',
+        },
+        {
+          label: 'SAML',
+          value: 'authn_saml',
+          description: 'This component uses SAML',
+        },
+        {
+          label: 'Other',
+          value: 'authn_other',
+          description: 'This component uses other authentication standard',
+        },
+        {
+          label: 'None',
+          value: 'authn_none',
+          description: 'This component does NOT use any authentication standard',
+        },
+      ],
+    },
+    {
+      label: 'Authorization',
+      options: [
+        {
+          label: 'OAuth 2.0',
+          value: 'authz_oauth',
+          description: 'This component uses OAuth 2.0',
+        },
+        {
+          label: 'Other',
+          value: 'authz_other',
+          description: 'This component uses other authorization standard',
+        },
+        {
+          label: 'None',
+          value: 'authz_none',
+          description: 'This component does NOT use any authorization standard',
+        },
+      ],
+    },
+    {
+      label: 'Secret & session management',
+      options: [
+        {
+          label: 'Implements secret management',
+          value: 'ssm_secrets',
+          description: 'This component implements secrets management',
+        },
+        {
+          label: 'Implements session management',
+          value: 'ssm_session',
+          description: 'This component implements session management',
+        },
+      ],
+    },
+  ];
+};
\ No newline at end of file
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/components/FlowChart/FlowChartWithState.tsx b/src/components/generic/DiagramCanvas/flowDiagram/components/FlowChart/FlowChartWithState.tsx
index 28258dc..f91d4aa 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/components/FlowChart/FlowChartWithState.tsx
+++ b/src/components/generic/DiagramCanvas/flowDiagram/components/FlowChart/FlowChartWithState.tsx
@@ -24,6 +24,7 @@ import {
 } from '../../container/actions';
 import { Input, Button, Select, Message } from '../../element';
 import { IOnCanvasClick } from 'react-work-flow';
+import { OptionDefinition } from '@cloudscape-design/components/internal/components/option/interfaces';
 
 const ModelBox = styled.div`
   width: 100%;
@@ -88,8 +89,18 @@ export interface IFlowChartWithStateProps {
   getWorkFlowChartValue?: (workFlowValue: any) => void;
   isAllowAddLinkLabel?: boolean;
   nodeRoleOptions: any[];
-  filterStatementsCallbaack?: (strideFilter: string, objectId: string, objectName?: string,
-    objectDescription?: string, objectOutOfScope?: boolean, objectOutOfScopeReason?: string,
+  filterStatementsCallbaack?: (
+    strideFilter: string,
+    objectId: string,
+    objectType: string,
+    objectName?: string,
+    objectDescription?: string,
+    objectOutOfScope?: boolean,
+    objectOutOfScopeReason?: string,
+    objectTags?: string[],
+    dataFeatures?: ReadonlyArray<OptionDefinition>,
+    techFeatures?: ReadonlyArray<OptionDefinition>,
+    securityFeatures?: ReadonlyArray<OptionDefinition>,
     threats?: {id: string}[]) => void;
 };
 
@@ -100,8 +111,18 @@ let timer:any = null;
  */
 class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChart> {
   public state: IChart;
-  public filterStatementsCallbaack?: (strideFilter: string, objectId: string, objectName?: string,
-    objectDescription?: string, objectOutOfScope?: boolean, objectOutOfScopeReason?: string,
+  public filterStatementsCallbaack?: (
+    strideFilter: string,
+    objectId: string,
+    objectType: string,
+    objectName?: string,
+    objectDescription?: string,
+    objectOutOfScope?: boolean,
+    objectOutOfScopeReason?: string,
+    objectTags?: string[],
+    dataFeatures?: ReadonlyArray<OptionDefinition>,
+    techFeatures?: ReadonlyArray<OptionDefinition>,
+    securityFeatures?: ReadonlyArray<OptionDefinition>,
     threats?: {id: string}[]) => void;
   public emptyProperties: any;
 
@@ -119,6 +140,10 @@ class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChar
       nodeDescription: '',
       nodeOutOfScope: false,
       nodeOutOfScopeReason: '',
+      tags: [],
+      dataFeatures: [],
+      techFeatures: [],
+      securityFeatures: [],
       threats: [],
       nodeRoleOption: '',
       linkLabel: '',
@@ -135,6 +160,10 @@ class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChar
       description: '',
       outOfScope: false,
       outOfScopeReason: '',
+      tags: [],
+      dataFeatures: [],
+      techFeatures: [],
+      securityFeatures: [],
       threats: [],
     };
   };
@@ -147,6 +176,10 @@ class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChar
       nodeDescription: '',
       nodeOutOfScope: false,
       nodeOutOfScopeReason: '',
+      tags: [],
+      dataFeatures: [],
+      techFeatures: [],
+      securityFeatures: [],
       threats: [],
       clickNodeId: '',
       linkLabel: '',
@@ -156,7 +189,7 @@ class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChar
     });
 
     if (this.filterStatementsCallbaack) {
-      this.filterStatementsCallbaack('', '', '', '', false, '', []);
+      this.filterStatementsCallbaack('', '', 'canvas', '', '', false, '', [], [], [], []);
     }
   };
 
@@ -196,9 +229,20 @@ class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChar
       });
 
       if (this.filterStatementsCallbaack) {
-        this.filterStatementsCallbaack(filterSTRIDE, nodeId, nodeProperties.name,
-          nodeProperties.description, nodeProperties.outOfScope, nodeProperties.outOfScopeReason,
-          nodeProperties.threats);
+        this.filterStatementsCallbaack(
+          filterSTRIDE,
+          nodeId,
+          selectedNode.type,
+          nodeProperties.name,
+          nodeProperties.description,
+          nodeProperties.outOfScope,
+          nodeProperties.outOfScopeReason,
+          nodeProperties.tags,
+          nodeProperties.dataFeatures,
+          nodeProperties.techFeatures,
+          nodeProperties.securityFeatures,
+          nodeProperties.threats,
+        );
       };
     }
   };
@@ -249,7 +293,18 @@ class FlowChartWithState extends React.Component<IFlowChartWithStateProps, IChar
       },
     });
     if (this.filterStatementsCallbaack) {
-      this.filterStatementsCallbaack('T,I,D', linkId, linkProperties.label, linkProperties.description, linkProperties.outOfScope, linkProperties.outOfScopeReason,
+      this.filterStatementsCallbaack(
+        'T,I,D',
+        linkId,
+        'link',
+        linkProperties.label,
+        linkProperties.description,
+        linkProperties.outOfScope,
+        linkProperties.outOfScopeReason,
+        linkProperties.tags,
+        linkProperties.dataFeatures,
+        linkProperties.techFeatures,
+        linkProperties.securityFeatures,
         linkProperties.threats);
     }
   };
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/layout/Sidebar.tsx b/src/components/generic/DiagramCanvas/flowDiagram/layout/Sidebar.tsx
index 3375d09..6276879 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/layout/Sidebar.tsx
+++ b/src/components/generic/DiagramCanvas/flowDiagram/layout/Sidebar.tsx
@@ -16,7 +16,7 @@
 import styled from 'styled-components';
 
 export const Sidebar = styled.div`
-  width: 200px;
+  width: 100px;
   background: white;
   display: flex;
   flex-direction: column;
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/layout/SidebarItem.tsx b/src/components/generic/DiagramCanvas/flowDiagram/layout/SidebarItem.tsx
index 196807f..5ef1fa1 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/layout/SidebarItem.tsx
+++ b/src/components/generic/DiagramCanvas/flowDiagram/layout/SidebarItem.tsx
@@ -44,11 +44,11 @@ const Outer = styled.div<IOuterProps>`
         }
         return `
           &.start {
-            width: 100px;
-            height: 100px;
-            border-radius: 50px;
+            width: 80px;
+            height: 80px;
+            border-radius: 40px;
             background: white;
-            line-height: 100px;
+            line-height: 80px;
             padding: 0;
             text-align: center;
             color: black;
@@ -61,9 +61,9 @@ const Outer = styled.div<IOuterProps>`
         }
         return `
           &.process-queue {
-            width: 120px;
-            height: 60px;
-            line-height: 60px;
+            width: 80px;
+            height: 45px;
+            line-height: 22px;
             text-align: center;
             border-radius: 10px;
             background: white;
@@ -78,9 +78,9 @@ const Outer = styled.div<IOuterProps>`
         }
         return `
           &.process-point {
-            width: 120px;
-            height: 60px;
-            line-height: 60px;
+            width: 80px;
+            height: 40px;
+            line-height: 40px;
             text-align: center;
             background: white;
             color: black;
@@ -94,10 +94,10 @@ const Outer = styled.div<IOuterProps>`
         }
         return `
           &.end {
-            width: 120px;
-            height: 60px;
+            width: 80px;
+            height: 40px;
             background: white;
-            line-height: 60px;
+            line-height: 40px;
             padding: 0;
             text-align: center;
             color: black;
diff --git a/src/components/generic/DiagramCanvas/flowDiagram/types/chart.ts b/src/components/generic/DiagramCanvas/flowDiagram/types/chart.ts
index 54a45d7..5c2362e 100644
--- a/src/components/generic/DiagramCanvas/flowDiagram/types/chart.ts
+++ b/src/components/generic/DiagramCanvas/flowDiagram/types/chart.ts
@@ -13,6 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  ******************************************************************************************************************** */
+import { OptionDefinition } from '@cloudscape-design/components/internal/components/option/interfaces';
 import { IPosition, ISize } from './generics';
 
 export interface IChart {
@@ -36,6 +37,10 @@ export interface IChart {
   nodeDescription: string;
   nodeOutOfScope: boolean;
   nodeOutOfScopeReason: string;
+  tags: string[];
+  dataFeatures: ReadonlyArray<OptionDefinition>;
+  techFeatures: ReadonlyArray<OptionDefinition>;
+  securityFeatures: ReadonlyArray<OptionDefinition>;
   threats: {id: string}[];
   nodeRoleOption: string;
   linkLabel: string;
diff --git a/src/components/generic/DiagramCanvas/index.tsx b/src/components/generic/DiagramCanvas/index.tsx
index f94c504..ea07b27 100644
--- a/src/components/generic/DiagramCanvas/index.tsx
+++ b/src/components/generic/DiagramCanvas/index.tsx
@@ -34,6 +34,7 @@ import { useThreatsContext } from '../../../contexts';
 import intersectStringArrays from '../../../utils/intersectStringArrays';
 import ThreatList from './flowDiagram/components/Canvas/ThreatList/ThreatList';
 import PropertiesPanel from './flowDiagram/components/Canvas/PropertiesPanel/PropertiesPanel';
+import { OptionDefinition } from '@cloudscape-design/components/internal/components/option/interfaces';
 
 const diagramWrapper = css({
   display: 'grid',
@@ -42,6 +43,7 @@ const diagramWrapper = css({
   minHeight: '50%',
   width: '100%',
   maxWidth: '100%',
+  borderRadius: '10px',
 });
 
 export interface DiagramCanvasProps extends EditableComponentBaseProps {
@@ -62,6 +64,7 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
   const [id, setId] = useState('');
   const [name, setName] = useState('');
   const [content, setContent] = useState('');
+  const [workFlowValue, setWorkFlowValue] = useState<IChart>(chartSimple);
 
   useEffect(() => {
     onEditModeChange?.(editMode);
@@ -72,9 +75,10 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
       id,
       name,
       description: content,
+      diagramData: JSON.stringify(workFlowValue),
     });
     setEditMode(false);
-  }, [id, name, content, onConfirm]);
+  }, [id, name, content, workFlowValue, onConfirm]);
 
   const handleEdit = useCallback(() => {
     setId(entity.id || '');
@@ -284,20 +288,6 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
     );
   };
 
-  const startItemStyle = `
-  {
-    width: 100px;
-    height: 100px;
-    border-radius: 50px;
-    border: 2px solid black;
-    background: white;
-    color: black;
-    line-height: 100px;
-    padding: 0;
-    text-align: center;
-  }
-  `;
-
   const startPoint = {
     port1: {
       id: 'port1',
@@ -393,16 +383,22 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
     },
   ];
 
-  const [workFlowValue, setWorkFlowValue] = useState<IChart>(chartSimple);
+  /* START>>> TO BE REFACTORED */
   const { statementList } = useThreatsContext();
   const [threatList, setThreatList] = useState(statementList);
   const [selectedThreatList, setSelectedThreatList] = useState<{id: string}[]>([]);
   const [strideFilter, setStrideFilter] = useState('');
   const [clickedObjectId, setClickedObjectId] = useState('');
+  const [clickedObjectType, setClickedObjectType] = useState('');
   const [clickedObjectName, setClickedObjectName] = useState('');
   const [clickedObjectDescription, setClickedObjectDescription] = useState('');
   const [clickedObjectOutOfScope, setClickedObjectOutOfScope] = useState(false);
   const [clickedObjectOutOfScopeReason, setClickedObjectOutOfScopeReason] = useState('');
+  const [clickedObjectTags, setClickedObjectTags] = useState<string[]>([]);
+  const [clickedObjectDataFeatures, setClickedObjectDataFeatures] = useState<ReadonlyArray<OptionDefinition>>();
+  const [clickedObjectTechFeatures, setClickedObjectTechFeatures] = useState<ReadonlyArray<OptionDefinition>>();
+  const [clickedObjectSecurityFeatures, setClickedObjectSecurityFeatures] = useState<ReadonlyArray<OptionDefinition>>();
+
   const handleObjectNameChange = useCallback((newValue) => {
     setClickedObjectName(newValue);
   }, []);
@@ -415,6 +411,18 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
   const handleObjectOutOfScopeReasonChange = useCallback((newValue) => {
     setClickedObjectOutOfScopeReason(newValue);
   }, []);
+  const handleObjectTagsChange = useCallback((newValue) => {
+    setClickedObjectTags(newValue);
+  }, []);
+  const handleObjectDataFeaturesChange = useCallback((newValue) => {
+    setClickedObjectDataFeatures(newValue);
+  }, []);
+  const handleObjectTechFeaturesChange = useCallback((newValue) => {
+    setClickedObjectTechFeatures(newValue);
+  }, []);
+  const handleObjectSecurityFeaturesChange = useCallback((newValue) => {
+    setClickedObjectSecurityFeatures(newValue);
+  }, []);
 
   const handleThreatsSelectionChange = useCallback((newValue) => {
     setSelectedThreatList(newValue);
@@ -422,23 +430,37 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
 
   const getWorkFlowChartValue = (newWorkFlowValue) => {
     setWorkFlowValue(newWorkFlowValue);
-    console.log('work-flow: ', JSON.stringify(workFlowValue));
+    //console.log('work-flow: ', JSON.stringify(workFlowValue));
   };
 
-  function filterStatementsCallback (filter: string, objectId: string, objectName?: string,
-    objectDescription?: string, objectOutOfScope?: boolean, objectOutOfScopeReason?: string,
+  function filterStatementsCallback (
+    filter: string,
+    objectId: string,
+    objectType: string,
+    objectName?: string,
+    objectDescription?: string,
+    objectOutOfScope?: boolean,
+    objectOutOfScopeReason?: string,
+    objectTags?: string[],
+    dataFeatures?: ReadonlyArray<OptionDefinition>,
+    techFeatures?: ReadonlyArray<OptionDefinition>,
+    securityFeatures?: ReadonlyArray<OptionDefinition>,
     threats?: {id: string}[]) {
     setStrideFilter(filter);
     setClickedObjectId(objectId);
+    setClickedObjectType(objectType);
     setClickedObjectName(objectName!);
     setClickedObjectDescription(objectDescription!);
     setClickedObjectOutOfScope(objectOutOfScope!);
     setClickedObjectOutOfScopeReason(objectOutOfScopeReason!);
+    setClickedObjectTags(objectTags!);
+    setClickedObjectDataFeatures(dataFeatures!);
+    setClickedObjectTechFeatures(techFeatures!);
+    setClickedObjectSecurityFeatures(securityFeatures!);
     setSelectedThreatList(threats!);
   };
 
   useEffect( () => { // update list of threats panel
-    console.log('statementList', statementList);
     setThreatList(statementList.filter(statement => {
       const stride = statement.metadata?.find(m => m.key === 'STRIDE');
       let mergeSTRIDE: string[] = [];
@@ -460,16 +482,26 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
       workFlowValue.nodes[clickedObjectId].properties.description = clickedObjectDescription;
       workFlowValue.nodes[clickedObjectId].properties.outOfScope = clickedObjectOutOfScope;
       workFlowValue.nodes[clickedObjectId].properties.outOfScopeReason = clickedObjectOutOfScopeReason;
+      workFlowValue.nodes[clickedObjectId].properties.tags = clickedObjectTags;
+      workFlowValue.nodes[clickedObjectId].properties.dataFeatures = clickedObjectDataFeatures;
+      workFlowValue.nodes[clickedObjectId].properties.techFeatures = clickedObjectTechFeatures;
+      workFlowValue.nodes[clickedObjectId].properties.securityFeatures = clickedObjectSecurityFeatures;
       workFlowValue.nodes[clickedObjectId].properties.threats = selectedThreatList;
     } else if (clickedObjectId && clickedObjectId!== '' && workFlowValue.links[clickedObjectId]) {
       workFlowValue.links[clickedObjectId].properties.label = clickedObjectName;
       workFlowValue.links[clickedObjectId].properties.description = clickedObjectDescription;
       workFlowValue.links[clickedObjectId].properties.outOfScope = clickedObjectOutOfScope;
       workFlowValue.links[clickedObjectId].properties.outOfScopeReason = clickedObjectOutOfScopeReason;
+      workFlowValue.links[clickedObjectId].properties.tags = clickedObjectTags;
+      workFlowValue.links[clickedObjectId].properties.dataFeatures = clickedObjectDataFeatures;
+      workFlowValue.links[clickedObjectId].properties.techFeatures = clickedObjectTechFeatures;
+      workFlowValue.links[clickedObjectId].properties.securityFeatures = clickedObjectSecurityFeatures;
       workFlowValue.links[clickedObjectId].properties.threats = selectedThreatList;
     }
   }, [workFlowValue, clickedObjectName, clickedObjectId, clickedObjectDescription,
-    clickedObjectOutOfScope, clickedObjectOutOfScopeReason, selectedThreatList]);
+    clickedObjectOutOfScope, clickedObjectOutOfScopeReason, clickedObjectTags, selectedThreatList,
+    clickedObjectDataFeatures, clickedObjectTechFeatures, clickedObjectSecurityFeatures]);
+  /* END>>> TO BE REFACTORED */
 
   return (
     <ContentLayout
@@ -486,9 +518,9 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
       {editMode ? (
         <SpaceBetween direction='vertical' size='s'>
           <Container header={<Header>{headerTitle}</Header>}>
-            <Grid gridDefinition={[{ colspan: 2 }, { colspan: clickedObjectId!=='' ? 10:10 }, { colspan: clickedObjectId!=='' ? 0:0 }]}>
+            <Grid gridDefinition={[{ colspan: 1 }, { colspan: 11 }]}>
               <Sidebar>
-                <SidebarItem type="start" ports={startPoint} itemStyle={startItemStyle} />
+                <SidebarItem type="start" ports={startPoint} />
                 <SidebarItem type="process-point" ports={processPoint} />
                 <SidebarItem type="end" ports={ endPoint } />
                 <SidebarItem type="process-queue" ports={processQueuePoint} />
@@ -512,14 +544,23 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
           </Container>
           <Container header={<Header>Properties</Header>}>
             <PropertiesPanel
+              type={clickedObjectType}
               name={clickedObjectName}
               description={clickedObjectDescription}
               outOfScope={clickedObjectOutOfScope}
               outOfScopeReason={clickedObjectOutOfScopeReason}
+              tags={clickedObjectTags}
+              dataFeatures={clickedObjectDataFeatures}
+              techFeatures={clickedObjectTechFeatures}
+              securityFeatures={clickedObjectSecurityFeatures}
               onChangeName={handleObjectNameChange}
               onChangeDescription={handleObjectDescriptionChange}
               onChangeOutOfScope={handleObjectOutOfScopeChange}
               onChangeOutOfScopeReason={handleObjectOutOfScopeReasonChange}
+              onChangeTags={handleObjectTagsChange}
+              onChangeDataFeatures={handleObjectDataFeaturesChange}
+              onChangeTechFeatures={handleObjectTechFeaturesChange}
+              onChangeSecurityFeatures={handleObjectSecurityFeaturesChange}
             />
           </Container>
           <ThreatList
@@ -532,6 +573,19 @@ const DiagramCanvas: FC<DiagramCanvasProps> = ({
         (<SpaceBetween direction='vertical' size='s'>
           <Header variant='h3' key='diagramInfo'>Description</Header>
           <Header variant='h3' key='diagram'>{diagramTitle}</Header>
+          <div css={diagramWrapper}>
+            <FlowChartWithState
+              isAllowAddLinkLabel = {false}
+              initialValue={workFlowValue}
+              nodeRoleOptions={nodeRoleOptions}
+              Components={{
+                Port: PortCustom,
+                Node: NodeCustom,
+                Link: LinkCustom,
+              }}
+              config={{ readonly: true }}
+            />
+          </div>
         </SpaceBetween>)
       }
     </ContentLayout>
diff --git a/src/customTypes/diagram.ts b/src/customTypes/diagram.ts
index 640c374..f62b2f0 100644
--- a/src/customTypes/diagram.ts
+++ b/src/customTypes/diagram.ts
@@ -21,6 +21,7 @@ export const DiagramInfoSchema = z.object({
   name: z.string().min(3).max(64),
   description: z.string().max(4000).optional(),
   clickedObjectName: z.string().max(64).optional(),
+  diagramData: z.string().optional(),
 });
 
 export type DiagramInfo = z.infer<typeof DiagramInfoSchema>;
\ No newline at end of file
diff --git a/src/data/diagramData.json b/src/data/diagramData.json
new file mode 100644
index 0000000..e732a6e
--- /dev/null
+++ b/src/data/diagramData.json
@@ -0,0 +1,592 @@
+{
+  "offset": {
+    "x": -1922,
+    "y": -935,
+    "deltaX": 1,
+    "deltaY": 0,
+    "lastX": -1923,
+    "lastY": -935
+  },
+  "nodes": {
+    "44eadd5f-82ff-4471-97f8-08d191ac2759": {
+      "id": "44eadd5f-82ff-4471-97f8-08d191ac2759",
+      "position": {
+        "x": 2047,
+        "y": 953,
+        "deltaX": 0,
+        "deltaY": 1,
+        "lastX": 2047,
+        "lastY": 952
+      },
+      "orientation": 0,
+      "type": "process-point",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "top",
+          "position": {
+            "x": 60.5,
+            "y": -4.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 124.5,
+            "y": 30.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "bottom",
+          "position": {
+            "x": 60.5,
+            "y": 64.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 30.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Browser",
+        "Id": "Web browser",
+        "nodeRole": "",
+        "description": "Web browser"
+      },
+      "size": {
+        "width": 126,
+        "height": 66
+      }
+    },
+    "e1d51543-b36d-4633-ac61-c2066eae7fd8": {
+      "id": "e1d51543-b36d-4633-ac61-c2066eae7fd8",
+      "position": {
+        "x": 2204,
+        "y": 1123,
+        "deltaX": -1,
+        "deltaY": 0,
+        "lastX": 2205,
+        "lastY": 1123
+      },
+      "orientation": 0,
+      "type": "start",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 50.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 104.5,
+            "y": 50.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "top",
+          "position": {
+            "x": 50.5,
+            "y": -4.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "bottom",
+          "position": {
+            "x": 50.5,
+            "y": 104.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Web application",
+        "Id": "Web application process",
+        "nodeRole": "",
+        "description": "Web application process descriptio",
+        "outOfScope": true,
+        "outOfScopeReason": "because",
+        "threats": [
+          {
+            "id": "7b49bdbd-25e9-446f-b44a-46fa2807e182"
+          },
+          {
+            "id": "782adefc-b480-4e8f-83ee-64f6d680df0a"
+          }
+        ]
+      },
+      "size": {
+        "width": 104,
+        "height": 104
+      }
+    },
+    "cf59a623-ae24-4cf7-b113-92899a563d49": {
+      "id": "cf59a623-ae24-4cf7-b113-92899a563d49",
+      "position": {
+        "x": 1962,
+        "y": 1244.5,
+        "deltaX": -1,
+        "deltaY": 0,
+        "lastX": 1963,
+        "lastY": 1244.5
+      },
+      "orientation": 0,
+      "type": "end",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 30.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 124.5,
+            "y": 30.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "top",
+          "position": {
+            "x": 60.5,
+            "y": -4.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "bottom",
+          "position": {
+            "x": 60.5,
+            "y": 64.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Web app config",
+        "Id": "Web application process configuration data store",
+        "nodeRole": "",
+        "description": "Web application process configuration data store",
+        "outOfScope": true,
+        "threats": [
+          {
+            "id": "7b49bdbd-25e9-446f-b44a-46fa2807e182"
+          },
+          {
+            "id": "cbba3276-5ce2-47e0-bc77-aebc162c519f"
+          }
+        ]
+      },
+      "size": {
+        "width": 124,
+        "height": 68
+      }
+    },
+    "ce294822-879a-4d8c-91d4-2add4cb08751": {
+      "id": "ce294822-879a-4d8c-91d4-2add4cb08751",
+      "position": {
+        "x": 2546,
+        "y": 996
+      },
+      "orientation": 0,
+      "type": "end",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 30.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 124.5,
+            "y": 30.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "top",
+          "position": {
+            "x": 60.5,
+            "y": -4.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "bottom",
+          "position": {
+            "x": 60.5,
+            "y": 64.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Message Queue",
+        "Id": "Message queue",
+        "nodeRole": "",
+        "description": "Message queue"
+      },
+      "size": {
+        "width": 120,
+        "height": 68
+      }
+    },
+    "65fbdcde-d86a-4a59-b707-3f32344ab770": {
+      "id": "65fbdcde-d86a-4a59-b707-3f32344ab770",
+      "position": {
+        "x": 2452,
+        "y": 1298.5
+      },
+      "orientation": 0,
+      "type": "end",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 30.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 124.5,
+            "y": 30.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "top",
+          "position": {
+            "x": 60.5,
+            "y": -4.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "bottom",
+          "position": {
+            "x": 60.5,
+            "y": 64.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Database",
+        "Id": "Dynamo DB store",
+        "nodeRole": "",
+        "description": "Dynamo DB store"
+      },
+      "size": {
+        "width": 120,
+        "height": 68
+      }
+    },
+    "e3a034e2-9e3f-48b9-99fe-9b4aeb04c6c0": {
+      "id": "e3a034e2-9e3f-48b9-99fe-9b4aeb04c6c0",
+      "position": {
+        "x": 2767,
+        "y": 1184.5
+      },
+      "orientation": 0,
+      "type": "start",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 50.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 104.5,
+            "y": 50.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "top",
+          "position": {
+            "x": 50.5,
+            "y": -4.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "bottom",
+          "position": {
+            "x": 50.5,
+            "y": 104.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Background Worker Process",
+        "Id": "Background Worker Process",
+        "nodeRole": "",
+        "description": "Background Worker Process",
+        "threats": [
+          {
+            "id": "7b49bdbd-25e9-446f-b44a-46fa2807e182"
+          },
+          {
+            "id": "782adefc-b480-4e8f-83ee-64f6d680df0a"
+          },
+          {
+            "id": "a0f523b0-bbc0-4e6a-9064-500af1f3836e"
+          },
+          {
+            "id": "99648023-86fe-4b7d-829a-7011be545fa4"
+          },
+          {
+            "id": "6529dd8d-0b40-4eec-b4c4-5ee4f06619c0"
+          },
+          {
+            "id": "1649e8e4-f100-45f2-8c13-51dafc8a8251"
+          },
+          {
+            "id": "fec8777c-68b3-4569-84ce-9b9b1b9f5e9c"
+          },
+          {
+            "id": "0a264de2-c2e5-45c0-9075-0d437b9defa0"
+          },
+          {
+            "id": "7820db4a-1043-4dfa-bbc2-59774bb1f2fc"
+          },
+          {
+            "id": "19b98451-70ee-4814-af80-c1293b90cb9f"
+          }
+        ]
+      },
+      "size": {
+        "width": 104,
+        "height": 104
+      }
+    },
+    "23d9a34f-0fe7-4403-bffd-8878158b14cb": {
+      "id": "23d9a34f-0fe7-4403-bffd-8878158b14cb",
+      "position": {
+        "x": 2759,
+        "y": 1400.5,
+        "deltaX": 0,
+        "deltaY": -1,
+        "lastX": 2759,
+        "lastY": 1401.5
+      },
+      "orientation": 0,
+      "type": "end",
+      "ports": {
+        "port1": {
+          "id": "port1",
+          "type": "left",
+          "position": {
+            "x": -4.5,
+            "y": 30.5
+          }
+        },
+        "port2": {
+          "id": "port2",
+          "type": "right",
+          "position": {
+            "x": 124.5,
+            "y": 30.5
+          }
+        },
+        "port3": {
+          "id": "port3",
+          "type": "top",
+          "position": {
+            "x": 60.5,
+            "y": -4.5
+          }
+        },
+        "port4": {
+          "id": "port4",
+          "type": "bottom",
+          "position": {
+            "x": 60.5,
+            "y": 64.5
+          }
+        }
+      },
+      "properties": {
+        "name": "Worker Config",
+        "Id": "Background worker process configuration datastore",
+        "nodeRole": "",
+        "description": "Background worker process configuration datastore"
+      },
+      "size": {
+        "width": 120,
+        "height": 68
+      }
+    }
+  },
+  "links": {
+    "9a1392bd-6962-4ff3-b75c-c49523806b5a": {
+      "id": "9a1392bd-6962-4ff3-b75c-c49523806b5a",
+      "from": {
+        "nodeId": "44eadd5f-82ff-4471-97f8-08d191ac2759",
+        "portId": "port3"
+      },
+      "to": {
+        "nodeId": "e1d51543-b36d-4633-ac61-c2066eae7fd8",
+        "portId": "port3"
+      },
+      "properties": {
+        "label": "HTTPS Req",
+        "threats": [
+          {
+            "id": "7b49bdbd-25e9-446f-b44a-46fa2807e182"
+          },
+          {
+            "id": "a0f523b0-bbc0-4e6a-9064-500af1f3836e"
+          },
+          {
+            "id": "6529dd8d-0b40-4eec-b4c4-5ee4f06619c0"
+          },
+          {
+            "id": "fec8777c-68b3-4569-84ce-9b9b1b9f5e9c"
+          }
+        ]
+      }
+    },
+    "c96f97ce-db7b-425e-bd0b-9a19007ffebe": {
+      "id": "c96f97ce-db7b-425e-bd0b-9a19007ffebe",
+      "from": {
+        "nodeId": "e1d51543-b36d-4633-ac61-c2066eae7fd8",
+        "portId": "port1"
+      },
+      "to": {
+        "nodeId": "cf59a623-ae24-4cf7-b113-92899a563d49",
+        "portId": "port3"
+      },
+      "properties": {
+        "label": "Read config"
+      }
+    },
+    "0063b9b3-3d07-40d5-af1f-35bd8256d688": {
+      "id": "0063b9b3-3d07-40d5-af1f-35bd8256d688",
+      "from": {
+        "nodeId": "e1d51543-b36d-4633-ac61-c2066eae7fd8",
+        "portId": "port2"
+      },
+      "to": {
+        "nodeId": "ce294822-879a-4d8c-91d4-2add4cb08751",
+        "portId": "port1"
+      },
+      "properties": {
+        "label": "PUT Message"
+      }
+    },
+    "21cf03c4-5550-4508-af90-69f4458490ef": {
+      "id": "21cf03c4-5550-4508-af90-69f4458490ef",
+      "from": {
+        "nodeId": "e1d51543-b36d-4633-ac61-c2066eae7fd8",
+        "portId": "port4"
+      },
+      "to": {
+        "nodeId": "65fbdcde-d86a-4a59-b707-3f32344ab770",
+        "portId": "port3"
+      },
+      "properties": {
+        "label": "Queries"
+      }
+    },
+    "76a4f21a-a62c-44d3-bf86-1ac3806b35fa": {
+      "id": "76a4f21a-a62c-44d3-bf86-1ac3806b35fa",
+      "from": {
+        "nodeId": "ce294822-879a-4d8c-91d4-2add4cb08751",
+        "portId": "port4"
+      },
+      "to": {
+        "nodeId": "e3a034e2-9e3f-48b9-99fe-9b4aeb04c6c0",
+        "portId": "port3"
+      },
+      "properties": {
+        "label": "Message"
+      }
+    },
+    "e42e4ce7-7409-4dda-a70d-005e9fd0ab5f": {
+      "id": "e42e4ce7-7409-4dda-a70d-005e9fd0ab5f",
+      "from": {
+        "nodeId": "e3a034e2-9e3f-48b9-99fe-9b4aeb04c6c0",
+        "portId": "port4"
+      },
+      "to": {
+        "nodeId": "23d9a34f-0fe7-4403-bffd-8878158b14cb",
+        "portId": "port3"
+      },
+      "properties": {
+        "label": "Configuration"
+      }
+    }
+  },
+  "selected": {
+    "type": "node",
+    "id": "44eadd5f-82ff-4471-97f8-08d191ac2759"
+  },
+  "hovered": {
+    "type": "link",
+    "id": "c96f97ce-db7b-425e-bd0b-9a19007ffebe"
+  },
+  "preNodes": [
+    "44eadd5f-82ff-4471-97f8-08d191ac2759",
+    "e1d51543-b36d-4633-ac61-c2066eae7fd8",
+    "cf59a623-ae24-4cf7-b113-92899a563d49",
+    "ce294822-879a-4d8c-91d4-2add4cb08751",
+    "65fbdcde-d86a-4a59-b707-3f32344ab770",
+    "e3a034e2-9e3f-48b9-99fe-9b4aeb04c6c0",
+    "23d9a34f-0fe7-4403-bffd-8878158b14cb"
+  ],
+  "isModelShow": false,
+  "nodeName": "",
+  "nodeId": "",
+  "newNodeId": "",
+  "preLinks": [
+    "9a1392bd-6962-4ff3-b75c-c49523806b5a",
+    "c96f97ce-db7b-425e-bd0b-9a19007ffebe",
+    "0063b9b3-3d07-40d5-af1f-35bd8256d688",
+    "21cf03c4-5550-4508-af90-69f4458490ef",
+    "76a4f21a-a62c-44d3-bf86-1ac3806b35fa",
+    "e42e4ce7-7409-4dda-a70d-005e9fd0ab5f"
+  ],
+  "showModelName": "",
+  "linkLabel": "",
+  "newLinkId": "",
+  "clickNodeId": "44eadd5f-82ff-4471-97f8-08d191ac2759",
+  "modelOption": "addNode",
+  "nodeRoleOption": "",
+  "clickLinkId": "",
+  "alertMessageInfo": "",
+  "alertMessageStatus": "init",
+  "nodeDescription": "",
+  "nodeOutOfScope": false,
+  "nodeOutOfScopeReason": "",
+  "threats": []
+}
\ No newline at end of file