JavaFx, Java-11, Yakindu and eclipse migration.

+ Added yakindu's missing plugins as local until a proper update site is
setup by yakindu there is no other go.
+ JavaFx and Java-11 changes.
+ Eclipse 2020-06 Migration changes(Mainly target).
diff --git a/Yakindu-0.8.0/.project b/Yakindu-0.8.0/.project
new file mode 100644
index 0000000..50a14e5
--- /dev/null
+++ b/Yakindu-0.8.0/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>Yakindu-0.8.0</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+	</buildSpec>

+	<natures>

+	</natures>

+</projectDescription>

diff --git a/Yakindu-0.8.0/com.yakindu.solidity.app_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity.app_0.8.0.202008251354.jar
new file mode 100644
index 0000000..3c0dd54
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity.app_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/com.yakindu.solidity.ide_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity.ide_0.8.0.202008251354.jar
new file mode 100644
index 0000000..bf730c8
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity.ide_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/com.yakindu.solidity.intro_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity.intro_0.8.0.202008251354.jar
new file mode 100644
index 0000000..fafb5ef
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity.intro_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/com.yakindu.solidity.solc.win32.fragment_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity.solc.win32.fragment_0.8.0.202008251354.jar
new file mode 100644
index 0000000..da63038
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity.solc.win32.fragment_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/com.yakindu.solidity.solc_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity.solc_0.8.0.202008251354.jar
new file mode 100644
index 0000000..33c6efb
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity.solc_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/com.yakindu.solidity.ui_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity.ui_0.8.0.202008251354.jar
new file mode 100644
index 0000000..2300cc5
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity.ui_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/com.yakindu.solidity_0.8.0.202008251354.jar b/Yakindu-0.8.0/com.yakindu.solidity_0.8.0.202008251354.jar
new file mode 100644
index 0000000..35afe3c
--- /dev/null
+++ b/Yakindu-0.8.0/com.yakindu.solidity_0.8.0.202008251354.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.expressions.edit_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.expressions.edit_3.5.12.202006150950.jar
new file mode 100644
index 0000000..86719d4
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.expressions.edit_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.expressions.interpreter_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.expressions.interpreter_3.5.12.202006150950.jar
new file mode 100644
index 0000000..3baa6cc
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.expressions.interpreter_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.expressions.ui_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.expressions.ui_3.5.12.202006150950.jar
new file mode 100644
index 0000000..f496342
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.expressions.ui_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.expressions_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.expressions_3.5.12.202006150950.jar
new file mode 100644
index 0000000..04462c0
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.expressions_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.gmf.runtime_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.gmf.runtime_3.5.12.202006150950.jar
new file mode 100644
index 0000000..5a82479
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.gmf.runtime_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.types.edit_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.types.edit_3.5.12.202006150950.jar
new file mode 100644
index 0000000..57de098
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.types.edit_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.types_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.types_3.5.12.202006150950.jar
new file mode 100644
index 0000000..b141f81
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.types_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.xtext.utils.gmf_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.xtext.utils.gmf_3.5.12.202006150950.jar
new file mode 100644
index 0000000..6a17412
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.xtext.utils.gmf_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.base.xtext.utils.jface_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.base.xtext.utils.jface_3.5.12.202006150950.jar
new file mode 100644
index 0000000..8fc99df
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.base.xtext.utils.jface_3.5.12.202006150950.jar
Binary files differ
diff --git a/Yakindu-0.8.0/org.yakindu.sct.model.sruntime_3.5.12.202006150950.jar b/Yakindu-0.8.0/org.yakindu.sct.model.sruntime_3.5.12.202006150950.jar
new file mode 100644
index 0000000..7553b95
--- /dev/null
+++ b/Yakindu-0.8.0/org.yakindu.sct.model.sruntime_3.5.12.202006150950.jar
Binary files differ
diff --git a/com.yakindu.solidity.app/.classpath b/com.yakindu.solidity.app/.classpath
new file mode 100644
index 0000000..6ed1444
--- /dev/null
+++ b/com.yakindu.solidity.app/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry exported="true" kind="lib" path="com.yakindu.solidity.app_0.8.0.202008251354.jar"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/com.yakindu.solidity.app/.gitignore b/com.yakindu.solidity.app/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/com.yakindu.solidity.app/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/com.yakindu.solidity.app/.project b/com.yakindu.solidity.app/.project
new file mode 100644
index 0000000..d4a398b
--- /dev/null
+++ b/com.yakindu.solidity.app/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>com.yakindu.solidity.app</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/com.yakindu.solidity.app/.settings/org.eclipse.jdt.core.prefs b/com.yakindu.solidity.app/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..e2860e9
--- /dev/null
+++ b/com.yakindu.solidity.app/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

+org.eclipse.jdt.core.compiler.compliance=1.8

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.release=disabled

+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/com.yakindu.solidity.app/META-INF/MANIFEST.MF b/com.yakindu.solidity.app/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a1886be
--- /dev/null
+++ b/com.yakindu.solidity.app/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Solidity Tools Application
+Bundle-SymbolicName: com.yakindu.solidity.app;singleton:=true
+Bundle-Version: 0.8.0.202008251354
+Bundle-ClassPath: com.yakindu.solidity.app_0.8.0.202008251354.jar
+Bundle-Vendor: YAKINDU
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Created-By: Maven Archiver 3.5.0
+Build-Jdk-Spec: 11
diff --git a/com.yakindu.solidity.app/build.properties b/com.yakindu.solidity.app/build.properties
new file mode 100644
index 0000000..abd8bfc
--- /dev/null
+++ b/com.yakindu.solidity.app/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               com.yakindu.solidity.app_0.8.0.202008251354.jar

diff --git a/com.yakindu.solidity.app/com.yakindu.solidity.app_0.8.0.202008251354.jar b/com.yakindu.solidity.app/com.yakindu.solidity.app_0.8.0.202008251354.jar
new file mode 100644
index 0000000..3c0dd54
--- /dev/null
+++ b/com.yakindu.solidity.app/com.yakindu.solidity.app_0.8.0.202008251354.jar
Binary files differ
diff --git a/com.yakindu.solidity.app/images/icon_128x128.png b/com.yakindu.solidity.app/images/icon_128x128.png
new file mode 100644
index 0000000..ddc4830
--- /dev/null
+++ b/com.yakindu.solidity.app/images/icon_128x128.png
Binary files differ
diff --git a/com.yakindu.solidity.app/images/icon_16x16.png b/com.yakindu.solidity.app/images/icon_16x16.png
new file mode 100644
index 0000000..640a58d
--- /dev/null
+++ b/com.yakindu.solidity.app/images/icon_16x16.png
Binary files differ
diff --git a/com.yakindu.solidity.app/images/icon_256x256.png b/com.yakindu.solidity.app/images/icon_256x256.png
new file mode 100644
index 0000000..1e3be80
--- /dev/null
+++ b/com.yakindu.solidity.app/images/icon_256x256.png
Binary files differ
diff --git a/com.yakindu.solidity.app/images/icon_32x32.png b/com.yakindu.solidity.app/images/icon_32x32.png
new file mode 100644
index 0000000..e414dd2
--- /dev/null
+++ b/com.yakindu.solidity.app/images/icon_32x32.png
Binary files differ
diff --git a/com.yakindu.solidity.app/images/icon_48x48.png b/com.yakindu.solidity.app/images/icon_48x48.png
new file mode 100644
index 0000000..3aa05e2
--- /dev/null
+++ b/com.yakindu.solidity.app/images/icon_48x48.png
Binary files differ
diff --git a/com.yakindu.solidity.app/images/icon_64x64.png b/com.yakindu.solidity.app/images/icon_64x64.png
new file mode 100644
index 0000000..b3af3c6
--- /dev/null
+++ b/com.yakindu.solidity.app/images/icon_64x64.png
Binary files differ
diff --git a/com.yakindu.solidity.app/plugin.xml b/com.yakindu.solidity.app/plugin.xml
new file mode 100644
index 0000000..4b3dd72
--- /dev/null
+++ b/com.yakindu.solidity.app/plugin.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+<extension id="YST"

+			point="org.eclipse.core.runtime.products">

+		<product

+				application="org.eclipse.ui.ide.workbench"

+				name="YAKINDU SOLIDITY TOOLS">

+			<property

+					name="windowImages"

+					value="images/icon_16x16.png,images/icon_32x32.png,images/icon_48x48.png,images/icon_64x64.png,images/icon_128x128.png,images/icon_256x256.png">

+			</property>

+			<property

+					name="aboutText"

+					value="YAKINDU Solidity Tools (c) itemis AG, 2018. All rights reserved.">

+			</property>

+			<property

+					name="aboutImage"

+					value="images/icon_128x128.png">

+			</property>

+			<property

+					name="appName"

+					value="YAKINDU SOLIDITY TOOLS">

+			</property>

+		</product>

+	</extension>

+</plugin>

diff --git a/com.yakindu.solidity.app/plugin_customization.ini b/com.yakindu.solidity.app/plugin_customization.ini
new file mode 100644
index 0000000..99c4d7e
--- /dev/null
+++ b/com.yakindu.solidity.app/plugin_customization.ini
@@ -0,0 +1,46 @@
+# plugin_customization.ini 

+# sets default values for plug-in-specific preferences

+# keys are qualified by plug-in id

+# e.g., com.example.acmeplugin/myproperty=myvalue

+# java.io.Properties file (ISO 8859-1 with "\" escapes)

+# "%key" are externalized strings defined in plugin_customization.properties

+# This file does not need to be translated.

+

+# WARNING: This file defines the preference overrides for the Platform build 

+# (the one with no JDT or PDE), not the SDK build (aka the IDE).  

+# For the SDK build, use the plugin_customization.ini file in the 

+# org.eclipse.sdk plug-in instead.

+

+# Property "org.eclipse.ui/defaultPerspectiveId" controls the 

+# perspective that the workbench opens initially

+org.eclipse.ui/defaultPerspectiveId=org.eclipse.ui.resourcePerspective

+

+# new-style tabs by default

+org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false

+

+# put the perspective switcher on the top right

+org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight

+

+# show progress on startup

+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false

+

+# Welcome theme to use

+org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.slate

+

+# Encoding and formatting

+org.eclipse.core.resources/encoding=UTF-8

+

+# check for updates on startup

+org.eclipse.equinox.p2.ui.sdk.scheduler/enabled=true

+org.eclipse.equinox.p2.ui.sdk.scheduler/schedule=on-startup

+

+# dark theme 

+org.eclipse.e4.ui.css.swt.theme/themeId=org.eclipse.e3.ui.css.theme.e4_dark

+

+com.yakindu.solidity.Solidity/com.yakindu.solidity.Solidity.syntaxColorer.tokenStyles.comment.color=96,139,78

+com.yakindu.solidity.Solidity/com.yakindu.solidity.Solidity.syntaxColorer.tokenStyles.keyword.color=88,154,214

+com.yakindu.solidity.Solidity/com.yakindu.solidity.Solidity.syntaxColorer.tokenStyles.string.color=188,145,120

+

+# Editor

+org.eclipse.ui.editors/spacesForTabs=true

+org.eclipse.ui.editors/spellingEnabled=false

diff --git a/com.yakindu.solidity.app/pom.xml b/com.yakindu.solidity.app/pom.xml
new file mode 100644
index 0000000..2d806eb
--- /dev/null
+++ b/com.yakindu.solidity.app/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+  <modelVersion>4.0.0</modelVersion>

+  

+  <parent>

+    <groupId>org.eclipse.blockchain</groupId>

+    <artifactId>org.eclipse.blockchain.tycho</artifactId>

+    <version>1.0.0-SNAPSHOT</version>

+    <relativePath>../org.eclipse.blockchain.tycho</relativePath>

+  </parent>

+  

+  <groupId>org.eclipse.blockchain</groupId>

+  <artifactId>com.yakindu.solidity.app</artifactId>

+  <version>0.8.0.202008251354</version>

+  <packaging>eclipse-plugin</packaging>

+  

+</project>
\ No newline at end of file
diff --git a/com.yakindu.solidity.app/splash.bmp b/com.yakindu.solidity.app/splash.bmp
new file mode 100644
index 0000000..a4c6726
--- /dev/null
+++ b/com.yakindu.solidity.app/splash.bmp
Binary files differ
diff --git a/org.eclipse.blockchain.application/.gitignore b/org.eclipse.blockchain.application/.gitignore
index bb5e943..db84e24 100644
--- a/org.eclipse.blockchain.application/.gitignore
+++ b/org.eclipse.blockchain.application/.gitignore
@@ -1,2 +1,2 @@
-/bin
+/bin

 /target
\ No newline at end of file
diff --git a/org.eclipse.blockchain.application/about.html b/org.eclipse.blockchain.application/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.application/about.html
+++ b/org.eclipse.blockchain.application/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.application/license.txt b/org.eclipse.blockchain.application/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.application/license.txt
+++ b/org.eclipse.blockchain.application/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.model/.gitignore b/org.eclipse.blockchain.model/.gitignore
index 31de7f6..83bc2aa 100644
--- a/org.eclipse.blockchain.model/.gitignore
+++ b/org.eclipse.blockchain.model/.gitignore
@@ -1,4 +1,4 @@
-/bin
-/.classpath
-/.settings/
+/bin

+/.classpath

+/.settings/

 /target
\ No newline at end of file
diff --git a/org.eclipse.blockchain.model/about.html b/org.eclipse.blockchain.model/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.model/about.html
+++ b/org.eclipse.blockchain.model/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.model/license.txt b/org.eclipse.blockchain.model/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.model/license.txt
+++ b/org.eclipse.blockchain.model/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectHandler.java b/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectHandler.java
index 97a0274..55939d0 100644
--- a/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectHandler.java
+++ b/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectHandler.java
@@ -1,266 +1,266 @@
-/**
- * Copyright (c) 2020 RBEI and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v. 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Adhith Gopal - Initial API and Implementation
- *
- */
-package org.eclipse.blockchain.model.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.eclipse.blockchain.model.ethproject.DeploymentModel;
-import org.eclipse.blockchain.model.ethproject.EthereumProject;
-import org.eclipse.blockchain.model.ethproject.EthprojectFactory;
-import org.eclipse.blockchain.model.ethproject.EthprojectPackage;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- *
- * EMF Notification mechanism is not used here, if required then Adapter's have
- * to be created and registered in the list of adapters
- */
-public class EthereumProjectHandler {
-	private static EthereumProjectHandler instance = null;
-	private final Map<String, EthereumProject> projectMap = new HashMap<>();
-
-	private EthereumProjectHandler() {
-	}
-
-	/**
-	 * @return This provides an Ethereum Project Handle which can be used to
-	 *         manipulate the Ethereum Project
-	 */
-	public static EthereumProjectHandler getInstance() {
-		if (null == instance) {
-			instance = new EthereumProjectHandler();
-			/**
-			 * This is just to initialize the EMF model and listeners
-			 */
-			EthprojectPackage.eINSTANCE.eClass();
-		}
-		return instance;
-	}
-
-	/**
-	 * This returns the Ethereum Project instance that matches the project name. If
-	 * none match then a new Ethereum Project instance is created
-	 *
-	 * @param projectName - The name of the project
-	 * @return - EthereumProject
-	 */
-	public EthereumProject getEthProject(final String projectName) {
-		return this.projectMap.computeIfAbsent(projectName, (v) -> {
-			EthereumProject ethProj = EthprojectFactory.eINSTANCE.createEthereumProject();
-			/**
-			 * Initialize all collections so that no NPE gets thrown
-			 */
-			ethProj.setProjectBuilders(new ArrayList<>());
-			ethProj.setProjectNatures(new ArrayList<>());
-			ethProj.setCompiledSolidityFiles(new HashSet<>());
-			ethProj.setEnvironmentBasedDeployedModel(new HashMap<>());
-			return ethProj;
-		});
-	}
-
-	/**
-	 * Remove the project from the map
-	 *
-	 * @param projectName - The name of project which should be removed.
-	 */
-	public void removeEthProject(final String projectName) {
-		this.projectMap.remove(projectName);
-	}
-
-	/**
-	 * Adds the given nature to the list of project natures of ethereum project
-	 *
-	 * @param ethProject - The Ethereum Project for which nature should be added
-	 * @param natureId   - The nature id string
-	 */
-	public void addProjectNature(final EthereumProject ethProject, final String natureId) {
-		ethProject.getProjectNatures().add(natureId);
-	}
-
-	/**
-	 * Adds the given builder to the list of project builders of ethereum project
-	 *
-	 * @param ethProject - The Ethereum Project for which nature should be added
-	 * @param builderId  - The builder id string
-	 */
-	public void addProjectBuilder(final EthereumProject ethProject, final String builderId) {
-		ethProject.getProjectBuilders().add(builderId);
-	}
-
-	/**
-	 * @param projectName - The ethereum Project name for which first matching sol
-	 *                    file should be returned
-	 * @return - The first matching sol file, if none then null
-	 * @throws CoreException -
-	 */
-	public IFile getSolFile(final String projectName) throws CoreException {
-		EthereumProject ethProject = this.projectMap.get(projectName);
-		IProject project = ethProject.getProject();
-		if (project != null) {
-			project.accept(new IResourceVisitor() {
-
-				@Override
-				public boolean visit(final IResource resource) throws CoreException {
-					if ((resource instanceof IFile) && (resource.getFileExtension() != null)
-							&& resource.getFileExtension().equals("sol")) {
-						ethProject.setFirstMatchingSolFile(resource.getProjectRelativePath().toOSString());
-						return false;
-					}
-					return true;
-				}
-			});
-			return (IFile) project.findMember(ethProject.getFirstMatchingSolFile());
-		}
-		return null;
-	}
-
-	/**
-	 * This method is used to add the compiled solidity files to the set that is
-	 * maintained in this project
-	 *
-	 * @param solidityFile - The compiled solidity file that belongs to this project
-	 */
-	public void addCompiledSolidityFiles(final IResource solidityFile) {
-		EthereumProject ethProject = this.projectMap.get(solidityFile.getProject().getName());
-		ethProject.getCompiledSolidityFiles().add(solidityFile.getProjectRelativePath().toOSString());
-	}
-
-	/**
-	 *
-	 * @param scFile      - The SC resource
-	 * @param environment - This denotes the environment into which this SC is
-	 *                    deployed(Embedded/Geth)
-	 * @return - Whether the SC is deployed into the passed in environment
-	 */
-	public boolean isSCDeployed(final IResource scFile, final String environment) {
-		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())
-				.getEnvironmentBasedDeployedModel().get(environment);
-		return (map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString());
-	}
-
-	/**
-	 * This creates a deployment model for a smart contract that is deployed into a
-	 * blockchain
-	 *
-	 * @param contractAddress - The contract address of the deployed SC
-	 * @param scFile          - The SC resource
-	 * @param lastUsedAccount - The account that was last used for performing a
-	 *                        transaction
-	 * @param environment     - This denotes the environment into which this SC is
-	 *                        deployed(Embedded/Geth)
-	 */
-	public void createDeploymentModel(final String contractAddress, final IResource scFile,
-			final String lastUsedAccount, final String environment) {
-		DeploymentModel deploymentModel = EthprojectFactory.eINSTANCE.createDeploymentModel();
-		deploymentModel.setContractAddress(contractAddress);
-		deploymentModel.setScFile(scFile.getProjectRelativePath().toOSString());
-		deploymentModel.setLastUsedAccount(lastUsedAccount);
-		deploymentModel.setEnvironment(environment);
-
-		EthereumProject ethProject = this.projectMap.get(scFile.getProject().getName());
-		/**
-		 * The below addition will add all the DM's that get created to the ETHProj
-		 * model and will be serialized during modal save.
-		 */
-		ethProject.getDeploymentmodel().add(deploymentModel);
-		Map<String, DeploymentModel> depModelMap = ethProject.getEnvironmentBasedDeployedModel()
-				.computeIfAbsent(environment, m -> new HashMap<>());
-		depModelMap.put(scFile.getProjectRelativePath().toOSString(), deploymentModel);
-	}
-
-	/**
-	 *
-	 * @param scFile      - The SC resource
-	 * @param environment - This denotes the environment into which this SC is
-	 *                    deployed(Embedded/Geth)
-	 * @return - The account that was last used for performing a transaction
-	 */
-	public String getLastUsedAccount(final IResource scFile, final String environment) {
-		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())
-				.getEnvironmentBasedDeployedModel().get(environment);
-		if ((map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString())) {
-			return map.get(scFile.getProjectRelativePath().toOSString()).getLastUsedAccount();
-		}
-		return "";
-	}
-
-	/**
-	 * This is used to update the last used account(for transacting with blockchain)
-	 *
-	 * @param scFile         - The SC resource
-	 * @param accountDetails - The new account that was used for transaction
-	 * @param environment    - This denotes the environment into which this SC is
-	 *                       deployed(Embedded/Geth)
-	 */
-	public void updateLastUsedAccount(final IResource scFile, final String accountDetails, final String environment) {
-		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())
-				.getEnvironmentBasedDeployedModel().get(environment);
-		if ((map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString())) {
-			map.get(scFile.getProjectRelativePath().toOSString()).setLastUsedAccount(accountDetails);
-		}
-	}
-
-	/**
-	 *
-	 * @param scFile      - The SC resource
-	 * @param environment - This denotes the environment into which this SC is
-	 *                    deployed(Embedded/Geth)
-	 * @return - The contract address of the deployed SC
-	 */
-	public String getContractAddress(final IResource scFile, final String environment) {
-		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())
-				.getEnvironmentBasedDeployedModel().get(environment);
-		if ((map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString())) {
-			return map.get(scFile.getProjectRelativePath().toOSString()).getContractAddress();
-		}
-		return "";
-	}
-
-	/**
-	 * This method is used to remove the SC resource from the map which holds
-	 * deployed resources
-	 *
-	 * @param projectName - The ethereum project name from which SC should be
-	 *                    removed
-	 * @param resource    - The SC resource
-	 * @param environment - This denotes the environment into which this SC is
-	 *                    deployed(Embedded/Geth)
-	 */
-	public void removeDeploymentModelForResource(final IResource resource, final String environment) {
-		EthereumProject ethProject = this.projectMap.get(resource.getProject().getName());
-		if (null == ethProject) {
-			return;
-		}
-		Map<String, Map<String, DeploymentModel>> envMap = ethProject.getEnvironmentBasedDeployedModel();
-		if (null == envMap) {
-			return;
-		}
-		Map<String, DeploymentModel> map = envMap.get(environment);
-		if ((map != null) && map.containsKey(resource.getProjectRelativePath().toOSString())) {
-			DeploymentModel dm = map.remove(resource.getProjectRelativePath().toOSString());
-			/**
-			 * Also remove from ethProject
-			 */
-			ethProject.getDeploymentmodel().remove(dm);
-		}
-	}
-}
+/**

+ * Copyright (c) 2020 RBEI and others.

+ *

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v. 2.0

+ * which accompanies this distribution, and is available at

+ * https://www.eclipse.org/legal/epl-2.0/

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ *

+ * Contributors:

+ *     Adhith Gopal - Initial API and Implementation

+ *

+ */

+package org.eclipse.blockchain.model.core;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Map;

+

+import org.eclipse.blockchain.model.ethproject.DeploymentModel;

+import org.eclipse.blockchain.model.ethproject.EthereumProject;

+import org.eclipse.blockchain.model.ethproject.EthprojectFactory;

+import org.eclipse.blockchain.model.ethproject.EthprojectPackage;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IResourceVisitor;

+import org.eclipse.core.runtime.CoreException;

+

+/**

+ *

+ * EMF Notification mechanism is not used here, if required then Adapter's have

+ * to be created and registered in the list of adapters

+ */

+public class EthereumProjectHandler {

+	private static EthereumProjectHandler instance = null;

+	private final Map<String, EthereumProject> projectMap = new HashMap<>();

+

+	private EthereumProjectHandler() {

+	}

+

+	/**

+	 * @return This provides an Ethereum Project Handle which can be used to

+	 *         manipulate the Ethereum Project

+	 */

+	public static EthereumProjectHandler getInstance() {

+		if (null == instance) {

+			instance = new EthereumProjectHandler();

+			/**

+			 * This is just to initialize the EMF model and listeners

+			 */

+			EthprojectPackage.eINSTANCE.eClass();

+		}

+		return instance;

+	}

+

+	/**

+	 * This returns the Ethereum Project instance that matches the project name. If

+	 * none match then a new Ethereum Project instance is created

+	 *

+	 * @param projectName - The name of the project

+	 * @return - EthereumProject

+	 */

+	public EthereumProject getEthProject(final String projectName) {

+		return this.projectMap.computeIfAbsent(projectName, (v) -> {

+			EthereumProject ethProj = EthprojectFactory.eINSTANCE.createEthereumProject();

+			/**

+			 * Initialize all collections so that no NPE gets thrown

+			 */

+			ethProj.setProjectBuilders(new ArrayList<>());

+			ethProj.setProjectNatures(new ArrayList<>());

+			ethProj.setCompiledSolidityFiles(new HashSet<>());

+			ethProj.setEnvironmentBasedDeployedModel(new HashMap<>());

+			return ethProj;

+		});

+	}

+

+	/**

+	 * Remove the project from the map

+	 *

+	 * @param projectName - The name of project which should be removed.

+	 */

+	public void removeEthProject(final String projectName) {

+		this.projectMap.remove(projectName);

+	}

+

+	/**

+	 * Adds the given nature to the list of project natures of ethereum project

+	 *

+	 * @param ethProject - The Ethereum Project for which nature should be added

+	 * @param natureId   - The nature id string

+	 */

+	public void addProjectNature(final EthereumProject ethProject, final String natureId) {

+		ethProject.getProjectNatures().add(natureId);

+	}

+

+	/**

+	 * Adds the given builder to the list of project builders of ethereum project

+	 *

+	 * @param ethProject - The Ethereum Project for which nature should be added

+	 * @param builderId  - The builder id string

+	 */

+	public void addProjectBuilder(final EthereumProject ethProject, final String builderId) {

+		ethProject.getProjectBuilders().add(builderId);

+	}

+

+	/**

+	 * @param projectName - The ethereum Project name for which first matching sol

+	 *                    file should be returned

+	 * @return - The first matching sol file, if none then null

+	 * @throws CoreException -

+	 */

+	public IFile getSolFile(final String projectName) throws CoreException {

+		EthereumProject ethProject = this.projectMap.get(projectName);

+		IProject project = ethProject.getProject();

+		if (project != null) {

+			project.accept(new IResourceVisitor() {

+

+				@Override

+				public boolean visit(final IResource resource) throws CoreException {

+					if ((resource instanceof IFile) && (resource.getFileExtension() != null)

+							&& resource.getFileExtension().equals("sol")) {

+						ethProject.setFirstMatchingSolFile(resource.getProjectRelativePath().toOSString());

+						return false;

+					}

+					return true;

+				}

+			});

+			return (IFile) project.findMember(ethProject.getFirstMatchingSolFile());

+		}

+		return null;

+	}

+

+	/**

+	 * This method is used to add the compiled solidity files to the set that is

+	 * maintained in this project

+	 *

+	 * @param solidityFile - The compiled solidity file that belongs to this project

+	 */

+	public void addCompiledSolidityFiles(final IResource solidityFile) {

+		EthereumProject ethProject = this.projectMap.get(solidityFile.getProject().getName());

+		ethProject.getCompiledSolidityFiles().add(solidityFile.getProjectRelativePath().toOSString());

+	}

+

+	/**

+	 *

+	 * @param scFile      - The SC resource

+	 * @param environment - This denotes the environment into which this SC is

+	 *                    deployed(Embedded/Geth)

+	 * @return - Whether the SC is deployed into the passed in environment

+	 */

+	public boolean isSCDeployed(final IResource scFile, final String environment) {

+		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())

+				.getEnvironmentBasedDeployedModel().get(environment);

+		return (map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString());

+	}

+

+	/**

+	 * This creates a deployment model for a smart contract that is deployed into a

+	 * blockchain

+	 *

+	 * @param contractAddress - The contract address of the deployed SC

+	 * @param scFile          - The SC resource

+	 * @param lastUsedAccount - The account that was last used for performing a

+	 *                        transaction

+	 * @param environment     - This denotes the environment into which this SC is

+	 *                        deployed(Embedded/Geth)

+	 */

+	public void createDeploymentModel(final String contractAddress, final IResource scFile,

+			final String lastUsedAccount, final String environment) {

+		DeploymentModel deploymentModel = EthprojectFactory.eINSTANCE.createDeploymentModel();

+		deploymentModel.setContractAddress(contractAddress);

+		deploymentModel.setScFile(scFile.getProjectRelativePath().toOSString());

+		deploymentModel.setLastUsedAccount(lastUsedAccount);

+		deploymentModel.setEnvironment(environment);

+

+		EthereumProject ethProject = this.projectMap.get(scFile.getProject().getName());

+		/**

+		 * The below addition will add all the DM's that get created to the ETHProj

+		 * model and will be serialized during modal save.

+		 */

+		ethProject.getDeploymentmodel().add(deploymentModel);

+		Map<String, DeploymentModel> depModelMap = ethProject.getEnvironmentBasedDeployedModel()

+				.computeIfAbsent(environment, m -> new HashMap<>());

+		depModelMap.put(scFile.getProjectRelativePath().toOSString(), deploymentModel);

+	}

+

+	/**

+	 *

+	 * @param scFile      - The SC resource

+	 * @param environment - This denotes the environment into which this SC is

+	 *                    deployed(Embedded/Geth)

+	 * @return - The account that was last used for performing a transaction

+	 */

+	public String getLastUsedAccount(final IResource scFile, final String environment) {

+		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())

+				.getEnvironmentBasedDeployedModel().get(environment);

+		if ((map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString())) {

+			return map.get(scFile.getProjectRelativePath().toOSString()).getLastUsedAccount();

+		}

+		return "";

+	}

+

+	/**

+	 * This is used to update the last used account(for transacting with blockchain)

+	 *

+	 * @param scFile         - The SC resource

+	 * @param accountDetails - The new account that was used for transaction

+	 * @param environment    - This denotes the environment into which this SC is

+	 *                       deployed(Embedded/Geth)

+	 */

+	public void updateLastUsedAccount(final IResource scFile, final String accountDetails, final String environment) {

+		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())

+				.getEnvironmentBasedDeployedModel().get(environment);

+		if ((map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString())) {

+			map.get(scFile.getProjectRelativePath().toOSString()).setLastUsedAccount(accountDetails);

+		}

+	}

+

+	/**

+	 *

+	 * @param scFile      - The SC resource

+	 * @param environment - This denotes the environment into which this SC is

+	 *                    deployed(Embedded/Geth)

+	 * @return - The contract address of the deployed SC

+	 */

+	public String getContractAddress(final IResource scFile, final String environment) {

+		Map<String, DeploymentModel> map = this.projectMap.get(scFile.getProject().getName())

+				.getEnvironmentBasedDeployedModel().get(environment);

+		if ((map != null) && map.containsKey(scFile.getProjectRelativePath().toOSString())) {

+			return map.get(scFile.getProjectRelativePath().toOSString()).getContractAddress();

+		}

+		return "";

+	}

+

+	/**

+	 * This method is used to remove the SC resource from the map which holds

+	 * deployed resources

+	 *

+	 * @param projectName - The ethereum project name from which SC should be

+	 *                    removed

+	 * @param resource    - The SC resource

+	 * @param environment - This denotes the environment into which this SC is

+	 *                    deployed(Embedded/Geth)

+	 */

+	public void removeDeploymentModelForResource(final IResource resource, final String environment) {

+		EthereumProject ethProject = this.projectMap.get(resource.getProject().getName());

+		if (null == ethProject) {

+			return;

+		}

+		Map<String, Map<String, DeploymentModel>> envMap = ethProject.getEnvironmentBasedDeployedModel();

+		if (null == envMap) {

+			return;

+		}

+		Map<String, DeploymentModel> map = envMap.get(environment);

+		if ((map != null) && map.containsKey(resource.getProjectRelativePath().toOSString())) {

+			DeploymentModel dm = map.remove(resource.getProjectRelativePath().toOSString());

+			/**

+			 * Also remove from ethProject

+			 */

+			ethProject.getDeploymentmodel().remove(dm);

+		}

+	}

+}

diff --git a/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectModelHandler.java b/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectModelHandler.java
index b669169..2a98168 100644
--- a/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectModelHandler.java
+++ b/org.eclipse.blockchain.model/src/org/eclipse/blockchain/model/core/EthereumProjectModelHandler.java
@@ -1,101 +1,101 @@
-/**
- * Copyright (c) 2020 RBEI and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v. 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Adhith Gopal - Initial API and Implementation
- *
- */
-package org.eclipse.blockchain.model.core;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.blockchain.model.ethproject.DeploymentModel;
-import org.eclipse.blockchain.model.ethproject.EthereumProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-public class EthereumProjectModelHandler {
-	private static EthereumProjectModelHandler instance = null;
-
-	private EthereumProjectModelHandler() {
-	}
-
-	/**
-	 * @return
-	 */
-	public static EthereumProjectModelHandler getInstance() {
-		if (null == instance) {
-			instance = new EthereumProjectModelHandler();
-		}
-		return instance;
-	}
-
-	/**
-	 * @param projectsToSave
-	 * @throws IOException
-	 */
-	public void saveProjects(final List<EthereumProject> projectsToSave) throws IOException {
-		for (EthereumProject ethProj : projectsToSave) {
-			saveProject(ethProj);
-		}
-	}
-
-	/**
-	 * @param projectsToSave
-	 * @throws IOException
-	 */
-	public void saveProject(final EthereumProject projectToSave) throws IOException {
-		// Assign XMI resource factory IMPL for ethproject
-		Resource.Factory.Registry registry = Resource.Factory.Registry.INSTANCE;
-		registry.getExtensionToFactoryMap().put("ethproject", new XMIResourceFactoryImpl());
-
-		ResourceSet resourceSet = new ResourceSetImpl();
-		Resource resource = resourceSet
-				.createResource(URI.createFileURI(projectToSave.getProjectLocation() + File.separator + ".ethproject"));
-
-		resource.getContents().add(projectToSave);
-
-		resource.save(Collections.emptyMap());
-
-	}
-
-	/**
-	 * @param ethProjectPath
-	 * @return
-	 */
-	public EthereumProject loadProject(final String ethProjectPath) {
-		Resource.Factory.Registry registry = Resource.Factory.Registry.INSTANCE;
-		registry.getExtensionToFactoryMap().put("ethproject", new XMIResourceFactoryImpl());
-
-		ResourceSet resourceSet = new ResourceSetImpl();
-		Resource resource = resourceSet.getResource(URI.createFileURI(ethProjectPath), true);
-
-		EthereumProject ethProject = (EthereumProject) resource.getContents().get(0);
-		Map<String, Map<String, DeploymentModel>> deploymentMap = new HashMap<>();
-		reconstructEnvironmentBasedDeploymentMap(deploymentMap, ethProject.getDeploymentmodel());
-		ethProject.setEnvironmentBasedDeployedModel(deploymentMap);
-		return ethProject;
-	}
-
-	private void reconstructEnvironmentBasedDeploymentMap(final Map<String, Map<String, DeploymentModel>> map,
-			final List<DeploymentModel> list) {
-		for (DeploymentModel dm : list) {
-			map.computeIfAbsent(dm.getEnvironment(), v -> new HashMap<>()).put(dm.getScFile(), dm);
-		}
-	}
-}
+/**

+ * Copyright (c) 2020 RBEI and others.

+ *

+ * This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v. 2.0

+ * which accompanies this distribution, and is available at

+ * https://www.eclipse.org/legal/epl-2.0/

+ *

+ * SPDX-License-Identifier: EPL-2.0

+ *

+ * Contributors:

+ *     Adhith Gopal - Initial API and Implementation

+ *

+ */

+package org.eclipse.blockchain.model.core;

+

+import java.io.File;

+import java.io.IOException;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.blockchain.model.ethproject.DeploymentModel;

+import org.eclipse.blockchain.model.ethproject.EthereumProject;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

+

+public class EthereumProjectModelHandler {

+	private static EthereumProjectModelHandler instance = null;

+

+	private EthereumProjectModelHandler() {

+	}

+

+	/**

+	 * @return

+	 */

+	public static EthereumProjectModelHandler getInstance() {

+		if (null == instance) {

+			instance = new EthereumProjectModelHandler();

+		}

+		return instance;

+	}

+

+	/**

+	 * @param projectsToSave

+	 * @throws IOException

+	 */

+	public void saveProjects(final List<EthereumProject> projectsToSave) throws IOException {

+		for (EthereumProject ethProj : projectsToSave) {

+			saveProject(ethProj);

+		}

+	}

+

+	/**

+	 * @param projectsToSave

+	 * @throws IOException

+	 */

+	public void saveProject(final EthereumProject projectToSave) throws IOException {

+		// Assign XMI resource factory IMPL for ethproject

+		Resource.Factory.Registry registry = Resource.Factory.Registry.INSTANCE;

+		registry.getExtensionToFactoryMap().put("ethproject", new XMIResourceFactoryImpl());

+

+		ResourceSet resourceSet = new ResourceSetImpl();

+		Resource resource = resourceSet

+				.createResource(URI.createFileURI(projectToSave.getProjectLocation() + File.separator + ".ethproject"));

+

+		resource.getContents().add(projectToSave);

+

+		resource.save(Collections.emptyMap());

+

+	}

+

+	/**

+	 * @param ethProjectPath

+	 * @return

+	 */

+	public EthereumProject loadProject(final String ethProjectPath) {

+		Resource.Factory.Registry registry = Resource.Factory.Registry.INSTANCE;

+		registry.getExtensionToFactoryMap().put("ethproject", new XMIResourceFactoryImpl());

+

+		ResourceSet resourceSet = new ResourceSetImpl();

+		Resource resource = resourceSet.getResource(URI.createFileURI(ethProjectPath), true);

+

+		EthereumProject ethProject = (EthereumProject) resource.getContents().get(0);

+		Map<String, Map<String, DeploymentModel>> deploymentMap = new HashMap<>();

+		reconstructEnvironmentBasedDeploymentMap(deploymentMap, ethProject.getDeploymentmodel());

+		ethProject.setEnvironmentBasedDeployedModel(deploymentMap);

+		return ethProject;

+	}

+

+	private void reconstructEnvironmentBasedDeploymentMap(final Map<String, Map<String, DeploymentModel>> map,

+			final List<DeploymentModel> list) {

+		for (DeploymentModel dm : list) {

+			map.computeIfAbsent(dm.getEnvironment(), v -> new HashMap<>()).put(dm.getScFile(), dm);

+		}

+	}

+}

diff --git a/org.eclipse.blockchain.product/.gitignore b/org.eclipse.blockchain.product/.gitignore
index bb5e943..db84e24 100644
--- a/org.eclipse.blockchain.product/.gitignore
+++ b/org.eclipse.blockchain.product/.gitignore
@@ -1,2 +1,2 @@
-/bin
+/bin

 /target
\ No newline at end of file
diff --git a/org.eclipse.blockchain.product/about.html b/org.eclipse.blockchain.product/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.product/about.html
+++ b/org.eclipse.blockchain.product/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.product/license.txt b/org.eclipse.blockchain.product/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.product/license.txt
+++ b/org.eclipse.blockchain.product/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.rcp/.gitignore b/org.eclipse.blockchain.rcp/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/org.eclipse.blockchain.rcp/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.eclipse.blockchain.rcp/about.html b/org.eclipse.blockchain.rcp/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.rcp/about.html
+++ b/org.eclipse.blockchain.rcp/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.rcp/blockchain.product b/org.eclipse.blockchain.rcp/blockchain.product
index 664585b..497dc02 100644
--- a/org.eclipse.blockchain.rcp/blockchain.product
+++ b/org.eclipse.blockchain.rcp/blockchain.product
@@ -35,7 +35,6 @@
    <vm>

    </vm>

 

-

    <plugins>

       <plugin id="ch.qos.logback.classic"/>

       <plugin id="ch.qos.logback.core"/>

@@ -48,11 +47,17 @@
       <plugin id="com.ibm.icu"/>

       <plugin id="com.jcraft.jsch"/>

       <plugin id="com.jcraft.jzlib"/>

-      <plugin id="com.yakindu.solidity" version="0.7.2.201804271436"/>

-      <plugin id="com.yakindu.solidity.ide" version="0.7.2.201804271436"/>

-      <plugin id="com.yakindu.solidity.ui" version="0.7.2.201804271436"/>

+      <plugin id="com.sun.jna"/>

+      <plugin id="com.sun.jna.platform"/>

+      <plugin id="com.yakindu.solidity"/>

+      <plugin id="com.yakindu.solidity.app"/>

+      <plugin id="com.yakindu.solidity.ide"/>

+      <plugin id="com.yakindu.solidity.solc"/>

+      <plugin id="com.yakindu.solidity.solc.win32.fragment" fragment="true"/>

+      <plugin id="com.yakindu.solidity.ui"/>

+      <plugin id="io.github.classgraph"/>

       <plugin id="java_cup.runtime"/>

-      <plugin id="javax.activation"/>

+      <plugin id="javax.activation" version="1.1.0.v201211130549"/>

       <plugin id="javax.annotation"/>

       <plugin id="javax.inject"/>

       <plugin id="javax.jms"/>

@@ -63,13 +68,32 @@
       <plugin id="javax.transaction" fragment="true"/>

       <plugin id="javax.xml"/>

       <plugin id="javax.xml.stream"/>

+      <plugin id="openjfx.base"/>

+      <plugin id="openjfx.controls"/>

+      <plugin id="openjfx.fxml"/>

+      <plugin id="openjfx.graphics.win32_64"/>

+      <plugin id="openjfx.swt"/>

       <plugin id="org.antlr.runtime" version="3.2.0.v201101311130"/>

       <plugin id="org.apache.ant"/>

-      <plugin id="org.apache.batik.constants"/>

-      <plugin id="org.apache.batik.css"/>

-      <plugin id="org.apache.batik.i18n"/>

-      <plugin id="org.apache.batik.util"/>

+      <plugin id="org.apache.batik.anim"/>

+      <plugin id="org.apache.batik.bridge"/>

+      <plugin id="org.apache.batik.codec"/>

+      <plugin id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>

+      <plugin id="org.apache.batik.css" version="1.9.1.v20181015-1528"/>

+      <plugin id="org.apache.batik.dom"/>

+      <plugin id="org.apache.batik.dom.svg"/>

+      <plugin id="org.apache.batik.ext.awt"/>

+      <plugin id="org.apache.batik.extension"/>

+      <plugin id="org.apache.batik.gvt"/>

+      <plugin id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>

+      <plugin id="org.apache.batik.parser"/>

+      <plugin id="org.apache.batik.pdf"/>

+      <plugin id="org.apache.batik.script"/>

+      <plugin id="org.apache.batik.svggen"/>

+      <plugin id="org.apache.batik.transcoder"/>

+      <plugin id="org.apache.batik.util" version="1.9.1.v20180703-1553"/>

       <plugin id="org.apache.batik.util.gui"/>

+      <plugin id="org.apache.batik.xml"/>

       <plugin id="org.apache.bcel"/>

       <plugin id="org.apache.bsf"/>

       <plugin id="org.apache.commons.cli"/>

@@ -78,7 +102,9 @@
       <plugin id="org.apache.commons.jxpath"/>

       <plugin id="org.apache.commons.lang"/>

       <plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>

+      <plugin id="org.apache.felix.gogo.command"/>

       <plugin id="org.apache.felix.gogo.runtime"/>

+      <plugin id="org.apache.felix.gogo.shell"/>

       <plugin id="org.apache.felix.scr"/>

       <plugin id="org.apache.log4j"/>

       <plugin id="org.apache.lucene.analyzers-common"/>

@@ -140,6 +166,8 @@
       <plugin id="org.eclipse.e4.ui.css.swt"/>

       <plugin id="org.eclipse.e4.ui.css.swt.theme"/>

       <plugin id="org.eclipse.e4.ui.di"/>

+      <plugin id="org.eclipse.e4.ui.dialogs"/>

+      <plugin id="org.eclipse.e4.ui.ide"/>

       <plugin id="org.eclipse.e4.ui.model.workbench"/>

       <plugin id="org.eclipse.e4.ui.services"/>

       <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/>

@@ -156,10 +184,13 @@
       <plugin id="org.eclipse.emf.codegen.ecore.xtext"/>

       <plugin id="org.eclipse.emf.common"/>

       <plugin id="org.eclipse.emf.common.ui"/>

+      <plugin id="org.eclipse.emf.databinding"/>

+      <plugin id="org.eclipse.emf.databinding.edit"/>

       <plugin id="org.eclipse.emf.ecore"/>

       <plugin id="org.eclipse.emf.ecore.change"/>

       <plugin id="org.eclipse.emf.ecore.edit"/>

       <plugin id="org.eclipse.emf.ecore.editor"/>

+      <plugin id="org.eclipse.emf.ecore.xcore.lib"/>

       <plugin id="org.eclipse.emf.ecore.xmi"/>

       <plugin id="org.eclipse.emf.edit"/>

       <plugin id="org.eclipse.emf.edit.ui"/>

@@ -212,6 +243,7 @@
       <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>

       <plugin id="org.eclipse.fx.osgi" fragment="true"/>

       <plugin id="org.eclipse.fx.ui.workbench3"/>

+      <plugin id="org.eclipse.gef"/>

       <plugin id="org.eclipse.help"/>

       <plugin id="org.eclipse.help.base"/>

       <plugin id="org.eclipse.help.ui"/>

@@ -235,7 +267,10 @@
       <plugin id="org.eclipse.jetty.util"/>

       <plugin id="org.eclipse.jface"/>

       <plugin id="org.eclipse.jface.databinding"/>

+      <plugin id="org.eclipse.jface.notifications"/>

       <plugin id="org.eclipse.jface.text"/>

+      <plugin id="org.eclipse.lsp4j"/>

+      <plugin id="org.eclipse.lsp4j.jsonrpc"/>

       <plugin id="org.eclipse.ltk.core.refactoring"/>

       <plugin id="org.eclipse.ltk.ui.refactoring"/>

       <plugin id="org.eclipse.m2e.archetype.common"/>

@@ -288,6 +323,7 @@
       <plugin id="org.eclipse.ui.workbench"/>

       <plugin id="org.eclipse.ui.workbench.texteditor"/>

       <plugin id="org.eclipse.update.configurator"/>

+      <plugin id="org.eclipse.urischeme"/>

       <plugin id="org.eclipse.wst.common.core"/>

       <plugin id="org.eclipse.wst.common.emf"/>

       <plugin id="org.eclipse.wst.common.emfworkbench.integration"/>

@@ -323,7 +359,6 @@
       <plugin id="org.eclipse.xtext.ecore"/>

       <plugin id="org.eclipse.xtext.generator"/>

       <plugin id="org.eclipse.xtext.ide"/>

-      <plugin id="org.eclipse.xtext.idea.generator"/>

       <plugin id="org.eclipse.xtext.java"/>

       <plugin id="org.eclipse.xtext.logging" fragment="true"/>

       <plugin id="org.eclipse.xtext.m2e"/>

@@ -370,11 +405,14 @@
       <plugin id="org.w3c.dom.events"/>

       <plugin id="org.w3c.dom.smil"/>

       <plugin id="org.w3c.dom.svg"/>

-      <plugin id="org.w3c.dom.svg.extension" fragment="true"/>

-      <plugin id="org.yakindu.base.expressions" version="3.3.2.201804191418"/>

-      <plugin id="org.yakindu.base.expressions.ui" version="3.3.2.201804191418"/>

-      <plugin id="org.yakindu.base.types" version="3.3.2.201804191418"/>

-      <plugin id="org.yakindu.base.xtext.utils.jface" version="3.3.2.201804191418"/>

+      <plugin id="org.yakindu.base.expressions"/>

+      <plugin id="org.yakindu.base.expressions.edit"/>

+      <plugin id="org.yakindu.base.expressions.interpreter"/>

+      <plugin id="org.yakindu.base.expressions.ui"/>

+      <plugin id="org.yakindu.base.types"/>

+      <plugin id="org.yakindu.base.types.edit"/>

+      <plugin id="org.yakindu.base.xtext.utils.jface"/>

+      <plugin id="org.yakindu.sct.model.sruntime"/>

    </plugins>

 

    <features>

diff --git a/org.eclipse.blockchain.rcp/license.txt b/org.eclipse.blockchain.rcp/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.rcp/license.txt
+++ b/org.eclipse.blockchain.rcp/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.rcp/pom.xml b/org.eclipse.blockchain.rcp/pom.xml
index e7e9873..00c77da 100644
--- a/org.eclipse.blockchain.rcp/pom.xml
+++ b/org.eclipse.blockchain.rcp/pom.xml
@@ -1,50 +1,58 @@
-<project

-    xmlns="http://maven.apache.org/POM/4.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-    <modelVersion>4.0.0</modelVersion>

+<project xmlns="http://maven.apache.org/POM/4.0.0"

+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+	<modelVersion>4.0.0</modelVersion>

 

-    <parent>

-        <groupId>org.eclipse.blockchain</groupId>

-        <artifactId>org.eclipse.blockchain.tycho</artifactId>

-        <version>1.0.0-SNAPSHOT</version>

-        <relativePath>../org.eclipse.blockchain.tycho</relativePath>

-    </parent>

+	<parent>

+		<groupId>org.eclipse.blockchain</groupId>

+		<artifactId>org.eclipse.blockchain.tycho</artifactId>

+		<version>1.0.0-SNAPSHOT</version>

+		<relativePath>../org.eclipse.blockchain.tycho</relativePath>

+	</parent>

 

-    <groupId>org.eclipse.blockchain</groupId>

-    <artifactId>org.eclipse.blockchain.rcp</artifactId>

-    <version>1.0.0-SNAPSHOT</version>

-    <packaging>eclipse-repository</packaging>

+	<groupId>org.eclipse.blockchain</groupId>

+	<artifactId>org.eclipse.blockchain.rcp</artifactId>

+	<version>1.0.0-SNAPSHOT</version>

+	<packaging>eclipse-repository</packaging>

 

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.eclipse.tycho</groupId>

-                <artifactId>tycho-p2-repository-plugin</artifactId>

-                <version>${tycho-version}</version>

-                <configuration>

-                    <includeAllDependencies>true</includeAllDependencies>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.eclipse.tycho</groupId>

-                <artifactId>tycho-p2-director-plugin</artifactId>

-                <version>${tycho-version}</version>

-                <executions>

-                    <execution>

-                        <id>materialize-products</id>

-                        <goals>

-                            <goal>materialize-products</goal>

-                        </goals>

-                    </execution>

-                    <execution>

-                        <id>archive-products</id>

-                        <goals>

-                            <goal>archive-products</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-repository-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					<includeAllDependencies>true</includeAllDependencies>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-director-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<executions>

+					<execution>

+						<id>materialize-products</id>

+						<goals>

+							<goal>materialize-products</goal>

+						</goals>

+					</execution>

+					<execution>

+						<id>archive-products</id>

+						<goals>

+							<goal>archive-products</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+		</plugins>

+	</build>

+

+	<!-- <repositories>

+		<repository>

+			<id>yakindu-missing-plugins-local-repo</id>

+			<name>Yakindu-local-repo</name>

+			<url>file://${basedir}/yakindu-missing-repo/</url>

+			<url>file://D:\block-chain\secoblocks-2021-bosch-git\secoblocks\org.eclipse.blockchain.rcp\yakindu-missing-repo</url>

+		</repository>

+	</repositories> -->

 </project>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.releng/about.html b/org.eclipse.blockchain.releng/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.releng/about.html
+++ b/org.eclipse.blockchain.releng/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.releng/license.txt b/org.eclipse.blockchain.releng/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.releng/license.txt
+++ b/org.eclipse.blockchain.releng/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.releng/pom.xml b/org.eclipse.blockchain.releng/pom.xml
index bcba072..5e2aec0 100644
--- a/org.eclipse.blockchain.releng/pom.xml
+++ b/org.eclipse.blockchain.releng/pom.xml
@@ -10,11 +10,21 @@
 

     <properties>

         <tycho-version>1.3.0</tycho-version>

-        <eclipse-repo.url>http://download.eclipse.org/releases/photon</eclipse-repo.url>

+        <!-- <eclipse-repo.url>http://download.eclipse.org/releases/photon</eclipse-repo.url>

         <eclipse-orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</eclipse-orbit.url>

         <xtext-url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.15.0</xtext-url>

-        <!-- <yakindu-url>http://updates.yakindu.com/solidity/releases</yakindu-url> -->

-        <yakindu-url>http://updates.yakindu.com/solidity/milestones</yakindu-url><!-- this contains 0.7.2 -->

+        <yakindu-url>http://updates.yakindu.com/solidity/releases</yakindu-url>

+        <yakindu-url>http://updates.yakindu.com/solidity/milestones</yakindu-url>this contains 0.7.2 -->

+        

+        <eclipse-repo.url>http://download.eclipse.org/releases/2020-06/</eclipse-repo.url>

+        <eclipse-orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository</eclipse-orbit.url>

+        <xtext-url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/</xtext-url>

+        <yakindu-url>http://updates.yakindu.com/statecharts/releases</yakindu-url>

+        <yakindu-url-2>http://updates.yakindu.com/solidity/releases</yakindu-url-2>

+        <emf-url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.22</emf-url>

+        <lsp-url>http://download.eclipse.org/lsp4j/updates/releases/0.10.0/</lsp-url>

+        <efx-url>http://download.eclipse.org/efxclipse/runtime-released/3.6.0/site</efx-url>

+        <efx-osgi-url>http://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-11/repository/</efx-osgi-url>

     </properties>

 

     <build>

@@ -84,15 +94,44 @@
             <layout>p2</layout>

         </repository>

         <repository>

-            <id>xtext-2.15</id>

+            <id>xtext-2.22</id>

             <url>${xtext-url}</url>

             <layout>p2</layout>

         </repository>

-        <repository>

+        <!-- <repository>

             <id>yakindu</id>

             <url>${yakindu-url}</url>

             <layout>p2</layout>

+        </repository> -->

+        <repository>

+            <id>yakindu2</id>

+            <url>${yakindu-url-2}</url>

+            <layout>p2</layout>

         </repository>

+        <repository>

+            <id>emf</id>

+            <url>${emf-url}</url>

+            <layout>p2</layout>

+        </repository>

+        <repository>

+            <id>lsp</id>

+            <url>${lsp-url}</url>

+            <layout>p2</layout>

+        </repository>

+        <repository>

+            <id>efx</id>

+            <url>${efx-url}</url>

+            <layout>p2</layout>

+        </repository>

+        <repository>

+            <id>efx-osgi</id>

+            <url>${efx-osgi-url}</url>

+            <layout>p2</layout>

+        </repository>

+        <!-- <repository>

+        	<id>yakindu-missing-plugins-local-repo</id>

+        	<url>file://${basedir}/yakindu-missing-repo/</url>

+        </repository> -->

     </repositories>

 

 </project>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.server.core/about.html b/org.eclipse.blockchain.server.core/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.server.core/about.html
+++ b/org.eclipse.blockchain.server.core/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.server.core/license.txt b/org.eclipse.blockchain.server.core/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.server.core/license.txt
+++ b/org.eclipse.blockchain.server.core/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.server.ui/about.html b/org.eclipse.blockchain.server.ui/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.server.ui/about.html
+++ b/org.eclipse.blockchain.server.ui/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.server.ui/license.txt b/org.eclipse.blockchain.server.ui/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.server.ui/license.txt
+++ b/org.eclipse.blockchain.server.ui/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.tycho/about.html b/org.eclipse.blockchain.tycho/about.html
index 122d18e..990d97e 100644
--- a/org.eclipse.blockchain.tycho/about.html
+++ b/org.eclipse.blockchain.tycho/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>2020</p> 
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>2020</p> 

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

 </html>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.tycho/license.txt b/org.eclipse.blockchain.tycho/license.txt
index 4c90559..8d0c207 100644
--- a/org.eclipse.blockchain.tycho/license.txt
+++ b/org.eclipse.blockchain.tycho/license.txt
@@ -1,274 +1,274 @@
-Eclipse Public License - v 2.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-    1. DEFINITIONS
-
-“Contribution” means:
-
-  * a) in the case of the initial Contributor, the initial content
-    Distributed under this Agreement, and
-  * b) in the case of each subsequent Contributor:
-      o i) changes to the Program, and
-      o ii) additions to the Program;
-    where such changes and/or additions to the Program originate from
-    and are Distributed by that particular Contributor. A Contribution
-    “originates” from a Contributor if it was added to the Program by
-    such Contributor itself or anyone acting on such Contributor's
-    behalf. Contributions do not include changes or additions to the
-    Program that are not Modified Works.
-
-“Contributor” means any person or entity that Distributes the Program.
-
-“Licensed Patents” mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-“Program” means the Contributions Distributed in accordance with this
-Agreement.
-
-“Recipient” means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-“Derivative Works” shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-“Modified Works” shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-“Distribute” means the acts of a) distributing or b) making available in
-any manner that enables the transfer of a copy.
-
-“Source Code” means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-“Secondary License” means either the GNU General Public License, Version
-2.0, or any later versions of that license, including any exceptions or
-additional permissions as identified by the initial Contributor.
-
-
-    2. GRANT OF RIGHTS
-
-  * a) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free copyright
-    license to reproduce, prepare Derivative Works of, publicly display,
-    publicly perform, Distribute and sublicense the Contribution of such
-    Contributor, if any, and such Derivative Works.
-  * b) Subject to the terms of this Agreement, each Contributor hereby
-    grants Recipient a non-exclusive, worldwide, royalty-free patent
-    license under Licensed Patents to make, use, sell, offer to sell,
-    import and otherwise transfer the Contribution of such Contributor,
-    if any, in Source Code or other form. This patent license shall
-    apply to the combination of the Contribution and the Program if, at
-    the time the Contribution is added by the Contributor, such addition
-    of the Contribution causes such combination to be covered by the
-    Licensed Patents. The patent license shall not apply to any other
-    combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-  * c) Recipient understands that although each Contributor grants the
-    licenses to its Contributions set forth herein, no assurances are
-    provided by any Contributor that the Program does not infringe the
-    patent or other intellectual property rights of any other entity.
-    Each Contributor disclaims any liability to Recipient for claims
-    brought by any other entity based on infringement of intellectual
-    property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes
-    sole responsibility to secure any other intellectual property rights
-    needed, if any. For example, if a third party patent license is
-    required to allow Recipient to Distribute the Program, it is
-    Recipient's responsibility to acquire that license before
-    distributing the Program.
-  * d) Each Contributor represents that to its knowledge it has
-    sufficient copyright rights in its Contribution, if any, to grant
-    the copyright license set forth in this Agreement.
-  * e) Notwithstanding the terms of any Secondary License, no
-    Contributor makes additional grants to any Recipient (other than
-    those set forth in this Agreement) as a result of such Recipient's
-    receipt of the Program under the terms of a Secondary License (if
-    permitted under the terms of Section 3).
-
-
-    3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  * a) the Program must also be made available as Source Code, in
-    accordance with section 3.2, and the Contributor must accompany the
-    Program with a statement that the Source Code for the Program is
-    available under this Agreement, and informs Recipients how to obtain
-    it in a reasonable manner on or through a medium customarily used
-    for software exchange; and
-  * b) the Contributor may Distribute the Program under a license
-    different than this Agreement, provided that such license:
-      o i) effectively disclaims on behalf of all other Contributors all
-        warranties and conditions, express and implied, including
-        warranties or conditions of title and non-infringement, and
-        implied warranties or conditions of merchantability and fitness
-        for a particular purpose;
-      o ii) effectively excludes on behalf of all other Contributors all
-        liability for damages, including direct, indirect, special,
-        incidental and consequential damages, such as lost profits;
-      o iii) does not attempt to limit or alter the recipients' rights
-        in the Source Code under section 3.2; and
-      o iv) requires any subsequent distribution of the Program by any
-        party to be under a license that satisfies the requirements of
-        this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  * a) it must be made available under this Agreement, or if the Program
-    (i) is combined with other material in a separate file or files made
-    available under a Secondary License, and (ii) the initial
-    Contributor attached to the Source Code the notice described in
-    Exhibit A of this Agreement, then the Program may be made available
-    under the terms of such Secondary Licenses, and
-  * b) a copy of this Agreement must be included with each copy of the
-    Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability (‘notices’) contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-
-    4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (“Commercial
-Contributor”) hereby agrees to defend and indemnify every other
-Contributor (“Indemnified Contributor”) against any losses, damages and
-costs (collectively “Losses”) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-
-    5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-
-
-    6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-
-    7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to Distribute the Program (including
-its Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-
-    Exhibit A – Form of Secondary Licenses Notice
-
-“This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}.”
-
-    Simply including a copy of this Agreement, including this Exhibit A
-    is not sufficient to license the Source Code under Secondary Licenses.
-
-    If it is not possible or desirable to put the notice in a particular
-    file, then You may include the notice in a location (such as a
-    LICENSE file in a relevant directory) where a recipient would be
-    likely to look for such a notice.
-
+Eclipse Public License - v 2.0

+

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF

+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

+

+

+    1. DEFINITIONS

+

+“Contribution” means:

+

+  * a) in the case of the initial Contributor, the initial content

+    Distributed under this Agreement, and

+  * b) in the case of each subsequent Contributor:

+      o i) changes to the Program, and

+      o ii) additions to the Program;

+    where such changes and/or additions to the Program originate from

+    and are Distributed by that particular Contributor. A Contribution

+    “originates” from a Contributor if it was added to the Program by

+    such Contributor itself or anyone acting on such Contributor's

+    behalf. Contributions do not include changes or additions to the

+    Program that are not Modified Works.

+

+“Contributor” means any person or entity that Distributes the Program.

+

+“Licensed Patents” mean patent claims licensable by a Contributor which

+are necessarily infringed by the use or sale of its Contribution alone

+or when combined with the Program.

+

+“Program” means the Contributions Distributed in accordance with this

+Agreement.

+

+“Recipient” means anyone who receives the Program under this Agreement

+or any Secondary License (as applicable), including Contributors.

+

+“Derivative Works” shall mean any work, whether in Source Code or other

+form, that is based on (or derived from) the Program and for which the

+editorial revisions, annotations, elaborations, or other modifications

+represent, as a whole, an original work of authorship.

+

+“Modified Works” shall mean any work in Source Code or other form that

+results from an addition to, deletion from, or modification of the

+contents of the Program, including, for purposes of clarity any new file

+in Source Code form that contains any contents of the Program. Modified

+Works shall not include works that contain only declarations,

+interfaces, types, classes, structures, or files of the Program solely

+in each case in order to link to, bind by name, or subclass the Program

+or Modified Works thereof.

+

+“Distribute” means the acts of a) distributing or b) making available in

+any manner that enables the transfer of a copy.

+

+“Source Code” means the form of a Program preferred for making

+modifications, including but not limited to software source code,

+documentation source, and configuration files.

+

+“Secondary License” means either the GNU General Public License, Version

+2.0, or any later versions of that license, including any exceptions or

+additional permissions as identified by the initial Contributor.

+

+

+    2. GRANT OF RIGHTS

+

+  * a) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free copyright

+    license to reproduce, prepare Derivative Works of, publicly display,

+    publicly perform, Distribute and sublicense the Contribution of such

+    Contributor, if any, and such Derivative Works.

+  * b) Subject to the terms of this Agreement, each Contributor hereby

+    grants Recipient a non-exclusive, worldwide, royalty-free patent

+    license under Licensed Patents to make, use, sell, offer to sell,

+    import and otherwise transfer the Contribution of such Contributor,

+    if any, in Source Code or other form. This patent license shall

+    apply to the combination of the Contribution and the Program if, at

+    the time the Contribution is added by the Contributor, such addition

+    of the Contribution causes such combination to be covered by the

+    Licensed Patents. The patent license shall not apply to any other

+    combinations which include the Contribution. No hardware per se is

+    licensed hereunder.

+  * c) Recipient understands that although each Contributor grants the

+    licenses to its Contributions set forth herein, no assurances are

+    provided by any Contributor that the Program does not infringe the

+    patent or other intellectual property rights of any other entity.

+    Each Contributor disclaims any liability to Recipient for claims

+    brought by any other entity based on infringement of intellectual

+    property rights or otherwise. As a condition to exercising the

+    rights and licenses granted hereunder, each Recipient hereby assumes

+    sole responsibility to secure any other intellectual property rights

+    needed, if any. For example, if a third party patent license is

+    required to allow Recipient to Distribute the Program, it is

+    Recipient's responsibility to acquire that license before

+    distributing the Program.

+  * d) Each Contributor represents that to its knowledge it has

+    sufficient copyright rights in its Contribution, if any, to grant

+    the copyright license set forth in this Agreement.

+  * e) Notwithstanding the terms of any Secondary License, no

+    Contributor makes additional grants to any Recipient (other than

+    those set forth in this Agreement) as a result of such Recipient's

+    receipt of the Program under the terms of a Secondary License (if

+    permitted under the terms of Section 3).

+

+

+    3. REQUIREMENTS

+

+3.1 If a Contributor Distributes the Program in any form, then:

+

+  * a) the Program must also be made available as Source Code, in

+    accordance with section 3.2, and the Contributor must accompany the

+    Program with a statement that the Source Code for the Program is

+    available under this Agreement, and informs Recipients how to obtain

+    it in a reasonable manner on or through a medium customarily used

+    for software exchange; and

+  * b) the Contributor may Distribute the Program under a license

+    different than this Agreement, provided that such license:

+      o i) effectively disclaims on behalf of all other Contributors all

+        warranties and conditions, express and implied, including

+        warranties or conditions of title and non-infringement, and

+        implied warranties or conditions of merchantability and fitness

+        for a particular purpose;

+      o ii) effectively excludes on behalf of all other Contributors all

+        liability for damages, including direct, indirect, special,

+        incidental and consequential damages, such as lost profits;

+      o iii) does not attempt to limit or alter the recipients' rights

+        in the Source Code under section 3.2; and

+      o iv) requires any subsequent distribution of the Program by any

+        party to be under a license that satisfies the requirements of

+        this section 3.

+

+3.2 When the Program is Distributed as Source Code:

+

+  * a) it must be made available under this Agreement, or if the Program

+    (i) is combined with other material in a separate file or files made

+    available under a Secondary License, and (ii) the initial

+    Contributor attached to the Source Code the notice described in

+    Exhibit A of this Agreement, then the Program may be made available

+    under the terms of such Secondary Licenses, and

+  * b) a copy of this Agreement must be included with each copy of the

+    Program.

+

+3.3 Contributors may not remove or alter any copyright, patent,

+trademark, attribution notices, disclaimers of warranty, or limitations

+of liability (‘notices’) contained within the Program from any copy of

+the Program which they Distribute, provided that Contributors may add

+their own appropriate notices.

+

+

+    4. COMMERCIAL DISTRIBUTION

+

+Commercial distributors of software may accept certain responsibilities

+with respect to end users, business partners and the like. While this

+license is intended to facilitate the commercial use of the Program, the

+Contributor who includes the Program in a commercial product offering

+should do so in a manner which does not create potential liability for

+other Contributors. Therefore, if a Contributor includes the Program in

+a commercial product offering, such Contributor (“Commercial

+Contributor”) hereby agrees to defend and indemnify every other

+Contributor (“Indemnified Contributor”) against any losses, damages and

+costs (collectively “Losses”) arising from claims, lawsuits and other

+legal actions brought by a third party against the Indemnified

+Contributor to the extent caused by the acts or omissions of such

+Commercial Contributor in connection with its distribution of the

+Program in a commercial product offering. The obligations in this

+section do not apply to any claims or Losses relating to any actual or

+alleged intellectual property infringement. In order to qualify, an

+Indemnified Contributor must: a) promptly notify the Commercial

+Contributor in writing of such claim, and b) allow the Commercial

+Contributor to control, and cooperate with the Commercial Contributor

+in, the defense and any related settlement negotiations. The Indemnified

+Contributor may participate in any such claim at its own expense.

+

+For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.

+

+

+    5. NO WARRANTY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS”

+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR

+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR

+PURPOSE. Each Recipient is solely responsible for determining the

+appropriateness of using and distributing the Program and assumes all

+risks associated with its exercise of rights under this Agreement,

+including but not limited to the risks and costs of program errors,

+compliance with applicable laws, damage to or loss of data, programs or

+equipment, and unavailability or interruption of operations.

+

+

+    6. DISCLAIMER OF LIABILITY

+

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT

+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS

+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST

+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE

+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+

+    7. GENERAL

+

+If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.

+

+If Recipient institutes patent litigation against any entity (including

+a cross-claim or counterclaim in a lawsuit) alleging that the Program

+itself (excluding combinations of the Program with other software or

+hardware) infringes such Recipient's patent(s), then such Recipient's

+rights granted under Section 2(b) shall terminate as of the date such

+litigation is filed.

+

+All Recipient's rights under this Agreement shall terminate if it fails

+to comply with any of the material terms or conditions of this Agreement

+and does not cure such failure in a reasonable period of time after

+becoming aware of such noncompliance. If all Recipient's rights under

+this Agreement terminate, Recipient agrees to cease use and distribution

+of the Program as soon as reasonably practicable. However, Recipient's

+obligations under this Agreement and any licenses granted by Recipient

+relating to the Program shall continue and survive.

+

+Everyone is permitted to copy and distribute copies of this Agreement,

+but in order to avoid inconsistency the Agreement is copyrighted and may

+only be modified in the following manner. The Agreement Steward reserves

+the right to publish new versions (including revisions) of this

+Agreement from time to time. No one other than the Agreement Steward has

+the right to modify this Agreement. The Eclipse Foundation is the

+initial Agreement Steward. The Eclipse Foundation may assign the

+responsibility to serve as the Agreement Steward to a suitable separate

+entity. Each new version of the Agreement will be given a distinguishing

+version number. The Program (including Contributions) may always be

+Distributed subject to the version of the Agreement under which it was

+received. In addition, after a new version of the Agreement is

+published, Contributor may elect to Distribute the Program (including

+its Contributions) under the new version.

+

+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient

+receives no rights or licenses to the intellectual property of any

+Contributor under this Agreement, whether expressly, by implication,

+estoppel or otherwise. All rights in the Program not expressly granted

+under this Agreement are reserved. Nothing in this Agreement is intended

+to be enforceable by any entity that is not a Contributor or Recipient.

+No third-party beneficiary rights are created under this Agreement.

+

+

+    Exhibit A – Form of Secondary Licenses Notice

+

+“This Source Code may also be made available under the following

+Secondary Licenses when the conditions for such availability set forth

+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),

+version(s), and exceptions or additional permissions here}.”

+

+    Simply including a copy of this Agreement, including this Exhibit A

+    is not sufficient to license the Source Code under Secondary Licenses.

+

+    If it is not possible or desirable to put the notice in a particular

+    file, then You may include the notice in a location (such as a

+    LICENSE file in a relevant directory) where a recipient would be

+    likely to look for such a notice.

+

     You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/org.eclipse.blockchain.tycho/pom.xml b/org.eclipse.blockchain.tycho/pom.xml
index 0d9877b..3703944 100644
--- a/org.eclipse.blockchain.tycho/pom.xml
+++ b/org.eclipse.blockchain.tycho/pom.xml
@@ -23,6 +23,16 @@
     <module>../org.eclipse.blockchain.model</module>

     <!-- The product plugin -->

     <module>../org.eclipse.blockchain.rcp</module>

+    <!-- Yakindu repository missing plugins -->

+    <module>../com.yakindu.solidity.app</module>

+    <module>../org.yakindu.base.expressions</module>

+    <module>../org.yakindu.base.expressions.edit</module>

+    <module>../org.yakindu.base.expressions.interpreter</module>

+    <module>../org.yakindu.base.expressions.ui</module>

+    <module>../org.yakindu.base.types</module>

+    <module>../org.yakindu.base.types.edit</module>

+    <module>../org.yakindu.base.xtext.utils.jface</module>

+    <module>../org.yakindu.sct.model.sruntime</module>

   </modules>

     

 </project>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.ui/.classpath b/org.eclipse.blockchain.ui/.classpath
index f256207..996e8ea 100644
--- a/org.eclipse.blockchain.ui/.classpath
+++ b/org.eclipse.blockchain.ui/.classpath
@@ -14,7 +14,10 @@
 	<classpathentry kind="lib" path="lib/tuples-4.5.12.jar"/>

 	<classpathentry kind="lib" path="lib/utils-4.5.12.jar"/>

 	<classpathentry kind="lib" path="lib/web3j-evm-4.5.12.jar"/>

-	<classpathentry kind="lib" path="lib/javafx-swt.jar"/>

+	<classpathentry kind="lib" path="javaFXlib/javafx.base.jar"/>

+	<classpathentry kind="lib" path="javaFXlib/javafx.controls.jar"/>

+	<classpathentry kind="lib" path="javaFXlib/javafx.graphics.jar"/>

+	<classpathentry kind="lib" path="javaFXlib/javafx-swt.jar"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="src" path="icon"/>

diff --git a/org.eclipse.blockchain.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.blockchain.ui/.settings/org.eclipse.jdt.core.prefs
index 088bb69..230c1b4 100644
--- a/org.eclipse.blockchain.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.blockchain.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,15 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=10

-org.eclipse.jdt.core.compiler.compliance=10

+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.compliance=11

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning

 org.eclipse.jdt.core.compiler.release=enabled

-org.eclipse.jdt.core.compiler.source=10

+org.eclipse.jdt.core.compiler.source=11

diff --git a/org.eclipse.blockchain.ui/META-INF/MANIFEST.MF b/org.eclipse.blockchain.ui/META-INF/MANIFEST.MF
index 22e2288..4c18a92 100644
--- a/org.eclipse.blockchain.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.blockchain.ui/META-INF/MANIFEST.MF
@@ -13,13 +13,12 @@
  org.eclipse.core.resources,

  org.eclipse.core.expressions,

  org.eclipse.swt,

- org.eclipse.fx.ui.workbench3,

  org.eclipse.ui.console,

  org.eclipse.ui.workbench,

- org.eclipse.blockchain.model

-Bundle-ClassPath: lib/javafx-swt.jar,

- lib/commons-io-2.4.jar,

- .

+ org.eclipse.blockchain.model,

+ org.eclipse.fx.ui.workbench3

+Bundle-ClassPath: .,

+ lib/commons-io-2.4.jar

 Export-Package: org.eclipse.blockchain.ui.console,

  org.eclipse.blockchain.ui.handlers,

  org.eclipse.blockchain.ui.perspective,

diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx-swt.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx-swt.jar
new file mode 100644
index 0000000..ec237d4
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx-swt.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.base.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.base.jar
new file mode 100644
index 0000000..017cdc7
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.base.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.controls.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.controls.jar
new file mode 100644
index 0000000..e427125
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.controls.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.fxml.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.fxml.jar
new file mode 100644
index 0000000..94934ae
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.fxml.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.graphics.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.graphics.jar
new file mode 100644
index 0000000..f9d8f3a
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.graphics.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.media.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.media.jar
new file mode 100644
index 0000000..7e4bdd7
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.media.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.swing.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.swing.jar
new file mode 100644
index 0000000..2900148
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.swing.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/javaFXlib/javafx.web.jar b/org.eclipse.blockchain.ui/javaFXlib/javafx.web.jar
new file mode 100644
index 0000000..d75a805
--- /dev/null
+++ b/org.eclipse.blockchain.ui/javaFXlib/javafx.web.jar
Binary files differ
diff --git a/org.eclipse.blockchain.ui/pom.xml b/org.eclipse.blockchain.ui/pom.xml
index 78158a8..6c0e176 100644
--- a/org.eclipse.blockchain.ui/pom.xml
+++ b/org.eclipse.blockchain.ui/pom.xml
@@ -1,16 +1,44 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  

-  <parent>

-    <groupId>org.eclipse.blockchain</groupId>

-    <artifactId>org.eclipse.blockchain.tycho</artifactId>

-    <version>1.0.0-SNAPSHOT</version>

-    <relativePath>../org.eclipse.blockchain.tycho</relativePath>

-  </parent>

-  

-  <groupId>org.eclipse.blockchain</groupId>

-  <artifactId>org.eclipse.blockchain.ui</artifactId>

-  <version>1.0.0-SNAPSHOT</version>

-  <packaging>eclipse-plugin</packaging>

-  

+<project xmlns="http://maven.apache.org/POM/4.0.0"

+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+	<modelVersion>4.0.0</modelVersion>

+

+	<parent>

+		<groupId>org.eclipse.blockchain</groupId>

+		<artifactId>org.eclipse.blockchain.tycho</artifactId>

+		<version>1.0.0-SNAPSHOT</version>

+		<relativePath>../org.eclipse.blockchain.tycho</relativePath>

+	</parent>

+

+	<groupId>org.eclipse.blockchain</groupId>

+	<artifactId>org.eclipse.blockchain.ui</artifactId>

+	<version>1.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-compiler-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					<encoding>UTF-8</encoding>

+					<extraClasspathElements>

+						<extraClasspathElement>

+							<groupId>org.openjfx</groupId>

+							<artifactId>javafx-controls</artifactId>

+							<version>11.0.2</version>

+						</extraClasspathElement>

+						<extraClasspathElement>

+							<groupId>org.openjfx</groupId>

+							<artifactId>javafx-swt</artifactId>

+							<version>11.0.2</version>

+							<systemPath>${basedir}/javaFXlib/javafx-swt.jar</systemPath>

+							<scope>system</scope>

+						</extraClasspathElement>

+					</extraClasspathElements>

+				</configuration>

+			</plugin>

+		</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.blockchain.ui/src/org/eclipse/blockchain/ui/views/EtherAccountViewPart.java b/org.eclipse.blockchain.ui/src/org/eclipse/blockchain/ui/views/EtherAccountViewPart.java
index c143615..2bf1bdf 100644
--- a/org.eclipse.blockchain.ui/src/org/eclipse/blockchain/ui/views/EtherAccountViewPart.java
+++ b/org.eclipse.blockchain.ui/src/org/eclipse/blockchain/ui/views/EtherAccountViewPart.java
@@ -191,7 +191,7 @@
 				.observableArrayList();

 		Map<String, String> acctInfo = Web3jHandler.getInstance().getAccount()

 				.getAccounts(getSelectedEnvironment());

-		Set<String> accounts = acctInfo.keySet();

+		Set<String> accounts = acctInfo.keySet(); 

 		accountList.addAll(accounts);

 		if (!accountList.isEmpty()) {

 			if (getSelectedEnvironment().equals(

diff --git a/org.yakindu.base.expressions.edit/.classpath b/org.yakindu.base.expressions.edit/.classpath
new file mode 100644
index 0000000..d7e95c8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry exported="true" kind="lib" path="org.yakindu.base.expressions.edit_3.5.12.202006150950.jar"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/org.yakindu.base.expressions.edit/.gitignore b/org.yakindu.base.expressions.edit/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.yakindu.base.expressions.edit/.project b/org.yakindu.base.expressions.edit/.project
new file mode 100644
index 0000000..70c9684
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.yakindu.base.expressions.edit</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.yakindu.base.expressions.edit/.settings/org.eclipse.jdt.core.prefs b/org.yakindu.base.expressions.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..e2860e9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

+org.eclipse.jdt.core.compiler.compliance=1.8

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.release=disabled

+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF b/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5d72170
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YAKINDU Base Edit
+Bundle-SymbolicName: org.yakindu.base.expressions.edit;singleton:=true
+Bundle-Version: 3.5.12.202006150950
+Bundle-ClassPath: org.yakindu.base.expressions.edit_3.5.12.202006150950.jar
+Bundle-Activator: org.yakindu.base.expressions.expressions.provider.ExpressionsEditPlugin$Implementation
+Bundle-Vendor: statecharts.org
+Bundle-Localization: plugin
+Export-Package: org.yakindu.base.expressions.expressions.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.yakindu.base.expressions;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.yakindu.base.types
+Built-By: sct-jenkinsslave
+Automatic-Module-Name: org.yakindu.base.expressions.edit
+Build-Jdk: 1.8.0_162
+Created-By: Apache Maven 3.3.9
+Import-Package: org.yakindu.base.base.provider,
+ org.yakindu.base.types.provider
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.yakindu.base.expressions.edit/build.properties b/org.yakindu.base.expressions.edit/build.properties
new file mode 100644
index 0000000..e650670
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               plugin.properties,\

+               org.yakindu.base.expressions.edit_3.5.12.202006150950.jar

diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_AssignmentExpression.gif
new file mode 100644
index 0000000..79263fb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseAndExpression.gif
new file mode 100644
index 0000000..fffcb5b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseOrExpression.gif
new file mode 100644
index 0000000..bb27d46
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseXorExpression.gif
new file mode 100644
index 0000000..3636fe0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ConditionalExpression.gif
new file mode 100644
index 0000000..880f257
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ElementReferenceExpression.gif
new file mode 100644
index 0000000..0d0bbae
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_FeatureCall.gif
new file mode 100644
index 0000000..a37ddd6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalAndExpression.gif
new file mode 100644
index 0000000..56be9a9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalNotExpression.gif
new file mode 100644
index 0000000..9043d2a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalOrExpression.gif
new file mode 100644
index 0000000..048c96b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalRelationExpression.gif
new file mode 100644
index 0000000..db7235c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..9ca6861
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..27dbe98
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..651acbd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ParenthesizedExpression.gif
new file mode 100644
index 0000000..7fb218d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1a81b0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ShiftExpression.gif
new file mode 100644
index 0000000..a021a81
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_TypeCastExpression.gif
new file mode 100644
index 0000000..e0f93db
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_UnaryExpression.gif
new file mode 100644
index 0000000..dd256cc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_args_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_arguments_Argument.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_arguments_Argument.gif
new file mode 100644
index 0000000..1e01c87
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgumentExpression_arguments_Argument.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_AssignmentExpression.gif
new file mode 100644
index 0000000..561bc08
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseAndExpression.gif
new file mode 100644
index 0000000..49e7eb9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseOrExpression.gif
new file mode 100644
index 0000000..5e6c9c1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseXorExpression.gif
new file mode 100644
index 0000000..40ef08b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ConditionalExpression.gif
new file mode 100644
index 0000000..78daa8e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ElementReferenceExpression.gif
new file mode 100644
index 0000000..9167798
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_FeatureCall.gif
new file mode 100644
index 0000000..1b76a8a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalAndExpression.gif
new file mode 100644
index 0000000..8848b01
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalNotExpression.gif
new file mode 100644
index 0000000..a18b783
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalOrExpression.gif
new file mode 100644
index 0000000..968c152
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalRelationExpression.gif
new file mode 100644
index 0000000..d990d5e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_MetaCall.gif
new file mode 100644
index 0000000..52c578c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..a258504
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..22660ab
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..e6a5692
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ParenthesizedExpression.gif
new file mode 100644
index 0000000..8fec234
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..22660ab
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..66a52f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ShiftExpression.gif
new file mode 100644
index 0000000..73b29f9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_TypeCastExpression.gif
new file mode 100644
index 0000000..cadd872
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateArgument_value_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_AssignmentExpression.gif
new file mode 100644
index 0000000..a47b32b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseAndExpression.gif
new file mode 100644
index 0000000..08ad00b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseOrExpression.gif
new file mode 100644
index 0000000..a0ba127
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseXorExpression.gif
new file mode 100644
index 0000000..a7ddbdb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ConditionalExpression.gif
new file mode 100644
index 0000000..f7a9c9f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ElementReferenceExpression.gif
new file mode 100644
index 0000000..ad7adc9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_Expression.gif
new file mode 100644
index 0000000..ac6a8a2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_FeatureCall.gif
new file mode 100644
index 0000000..06d2414
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalAndExpression.gif
new file mode 100644
index 0000000..3bfcf11
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalNotExpression.gif
new file mode 100644
index 0000000..b415959
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalOrExpression.gif
new file mode 100644
index 0000000..6010ac9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalRelationExpression.gif
new file mode 100644
index 0000000..88150e6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_MetaCall.gif
new file mode 100644
index 0000000..ba67912
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..d21c463
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..43a8eef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..324a64d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ParenthesizedExpression.gif
new file mode 100644
index 0000000..ad8a4e4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..43a8eef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..3f6e5f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ShiftExpression.gif
new file mode 100644
index 0000000..f00d453
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_TypeCastExpression.gif
new file mode 100644
index 0000000..4bf40a9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_UnaryExpression.gif
new file mode 100644
index 0000000..3ca8bfa
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_expression_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_AssignmentExpression.gif
new file mode 100644
index 0000000..a47b32b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseAndExpression.gif
new file mode 100644
index 0000000..08ad00b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseOrExpression.gif
new file mode 100644
index 0000000..a0ba127
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseXorExpression.gif
new file mode 100644
index 0000000..a7ddbdb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ConditionalExpression.gif
new file mode 100644
index 0000000..f7a9c9f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ElementReferenceExpression.gif
new file mode 100644
index 0000000..ad7adc9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_Expression.gif
new file mode 100644
index 0000000..ac6a8a2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_FeatureCall.gif
new file mode 100644
index 0000000..06d2414
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalAndExpression.gif
new file mode 100644
index 0000000..3bfcf11
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalNotExpression.gif
new file mode 100644
index 0000000..b415959
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalOrExpression.gif
new file mode 100644
index 0000000..6010ac9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalRelationExpression.gif
new file mode 100644
index 0000000..88150e6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_MetaCall.gif
new file mode 100644
index 0000000..ba67912
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..d21c463
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..43a8eef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..324a64d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ParenthesizedExpression.gif
new file mode 100644
index 0000000..ad8a4e4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..43a8eef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..3f6e5f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ShiftExpression.gif
new file mode 100644
index 0000000..f00d453
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_TypeCastExpression.gif
new file mode 100644
index 0000000..4bf40a9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_UnaryExpression.gif
new file mode 100644
index 0000000..3ca8bfa
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateAssignmentExpression_varRef_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..a89d0ec
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9cc534c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..be1e90e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..1f7c356
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..99f2fe5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..1ebc244
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..4e06b47
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0c84f38
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..7f7c51a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..2bd03ce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..0c1ee4c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_MetaCall.gif
new file mode 100644
index 0000000..99a4283
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..88ba66a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..655f0eb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..8247b72
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..54a8425
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..655f0eb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..a382f74
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..2769bc6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..7c34939
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_UnaryExpression.gif
new file mode 100644
index 0000000..01d1dbb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_leftOperand_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..a89d0ec
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9cc534c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..be1e90e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..1f7c356
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..99f2fe5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..1ebc244
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..4e06b47
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0c84f38
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..7f7c51a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..2bd03ce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..0c1ee4c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_MetaCall.gif
new file mode 100644
index 0000000..99a4283
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..88ba66a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..655f0eb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..8247b72
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..54a8425
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..655f0eb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..a382f74
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..2769bc6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..7c34939
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_UnaryExpression.gif
new file mode 100644
index 0000000..01d1dbb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBinaryExpression_rightOperand_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..1623e88
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..95a7dfd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..0db3a10
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..f67fa30
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..f3ab440
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..e272d25
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..cc09417
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..4f520a3
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..16c6f5a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..81ee371
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..3052dce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..febad48
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..7ae9b42
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..c5e047b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..7ee5dea
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..f1d4b2b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..bdb6bd5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..516fa12
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..d523a96
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..1623e88
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..95a7dfd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..0db3a10
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..f67fa30
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..f3ab440
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..e272d25
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..cc09417
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..4f520a3
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..16c6f5a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..81ee371
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..3052dce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..febad48
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..7ae9b42
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..c5e047b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..7ee5dea
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..f1d4b2b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..bdb6bd5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..516fa12
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..d523a96
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseAndExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..95a5245
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..7f8e88e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..d8b262a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..73cc3c1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..be83d34
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..52a6a5b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..daa2b9d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..424142e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..34d140b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..c970d5d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..05f18cc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..1230fa4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..7387309
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..889f3af
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..96a3cb7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..4b4267d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1e49376
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..6e59b0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..d63245c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..95a5245
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..7f8e88e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..d8b262a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..73cc3c1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..be83d34
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..52a6a5b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..daa2b9d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..424142e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..34d140b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..c970d5d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..05f18cc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..1230fa4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..7387309
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..889f3af
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..96a3cb7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..4b4267d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1e49376
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..6e59b0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..d63245c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseOrExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..5cfd2a8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..df04640
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..c5374c2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..6f01122
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..1cff796
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..054211b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..1c99c0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..f7bae5f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..214d0c2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..c01322f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..1abfdde
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..7bbad50
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..b7fdb14
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..6a5dfd4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..8e0ea4d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..8883ef6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..e44bf16
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..98e70dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..d0b4078
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..5cfd2a8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..df04640
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..c5374c2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..6f01122
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..1cff796
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..054211b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..1c99c0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..f7bae5f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..214d0c2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..c01322f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..1abfdde
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..7bbad50
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..b7fdb14
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..6a5dfd4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..8e0ea4d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..8883ef6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..e44bf16
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..98e70dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..d0b4078
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateBitwiseXorExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_AssignmentExpression.gif
new file mode 100644
index 0000000..97d3985
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseAndExpression.gif
new file mode 100644
index 0000000..6014874
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseOrExpression.gif
new file mode 100644
index 0000000..80dd10a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseXorExpression.gif
new file mode 100644
index 0000000..9f1e0b8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ConditionalExpression.gif
new file mode 100644
index 0000000..cbd1b19
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ElementReferenceExpression.gif
new file mode 100644
index 0000000..de9c324
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_Expression.gif
new file mode 100644
index 0000000..440a154
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_FeatureCall.gif
new file mode 100644
index 0000000..7c357e1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalAndExpression.gif
new file mode 100644
index 0000000..62d1b4e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalNotExpression.gif
new file mode 100644
index 0000000..b822374
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalOrExpression.gif
new file mode 100644
index 0000000..632bb40
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalRelationExpression.gif
new file mode 100644
index 0000000..90f4828
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_MetaCall.gif
new file mode 100644
index 0000000..355e3d0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..0e34563
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..1061b8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..ebe40ea
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ParenthesizedExpression.gif
new file mode 100644
index 0000000..53082b8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..1061b8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..72306dc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ShiftExpression.gif
new file mode 100644
index 0000000..cd91b67
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_TypeCastExpression.gif
new file mode 100644
index 0000000..97b8d1a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_UnaryExpression.gif
new file mode 100644
index 0000000..c213999
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_condition_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_AssignmentExpression.gif
new file mode 100644
index 0000000..97d3985
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseAndExpression.gif
new file mode 100644
index 0000000..6014874
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseOrExpression.gif
new file mode 100644
index 0000000..80dd10a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseXorExpression.gif
new file mode 100644
index 0000000..9f1e0b8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ConditionalExpression.gif
new file mode 100644
index 0000000..cbd1b19
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ElementReferenceExpression.gif
new file mode 100644
index 0000000..de9c324
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_Expression.gif
new file mode 100644
index 0000000..440a154
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_FeatureCall.gif
new file mode 100644
index 0000000..7c357e1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalAndExpression.gif
new file mode 100644
index 0000000..62d1b4e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalNotExpression.gif
new file mode 100644
index 0000000..b822374
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalOrExpression.gif
new file mode 100644
index 0000000..632bb40
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalRelationExpression.gif
new file mode 100644
index 0000000..90f4828
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_MetaCall.gif
new file mode 100644
index 0000000..355e3d0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..0e34563
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..1061b8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..ebe40ea
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ParenthesizedExpression.gif
new file mode 100644
index 0000000..53082b8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..1061b8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..72306dc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ShiftExpression.gif
new file mode 100644
index 0000000..cd91b67
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_TypeCastExpression.gif
new file mode 100644
index 0000000..97b8d1a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_UnaryExpression.gif
new file mode 100644
index 0000000..c213999
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_falseCase_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_AssignmentExpression.gif
new file mode 100644
index 0000000..97d3985
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseAndExpression.gif
new file mode 100644
index 0000000..6014874
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseOrExpression.gif
new file mode 100644
index 0000000..80dd10a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseXorExpression.gif
new file mode 100644
index 0000000..9f1e0b8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ConditionalExpression.gif
new file mode 100644
index 0000000..cbd1b19
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ElementReferenceExpression.gif
new file mode 100644
index 0000000..de9c324
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_Expression.gif
new file mode 100644
index 0000000..440a154
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_FeatureCall.gif
new file mode 100644
index 0000000..7c357e1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalAndExpression.gif
new file mode 100644
index 0000000..62d1b4e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalNotExpression.gif
new file mode 100644
index 0000000..b822374
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalOrExpression.gif
new file mode 100644
index 0000000..632bb40
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalRelationExpression.gif
new file mode 100644
index 0000000..90f4828
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_MetaCall.gif
new file mode 100644
index 0000000..355e3d0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..0e34563
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..1061b8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..ebe40ea
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ParenthesizedExpression.gif
new file mode 100644
index 0000000..53082b8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..1061b8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..72306dc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ShiftExpression.gif
new file mode 100644
index 0000000..cd91b67
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_TypeCastExpression.gif
new file mode 100644
index 0000000..97b8d1a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_UnaryExpression.gif
new file mode 100644
index 0000000..c213999
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateConditionalExpression_trueCase_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_AssignmentExpression.gif
new file mode 100644
index 0000000..88d8844
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9a2424e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseOrExpression.gif
new file mode 100644
index 0000000..b9cd878
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseXorExpression.gif
new file mode 100644
index 0000000..e0a4541
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ConditionalExpression.gif
new file mode 100644
index 0000000..dd8ab8d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ElementReferenceExpression.gif
new file mode 100644
index 0000000..0a9ad1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_Expression.gif
new file mode 100644
index 0000000..8b6df37
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_FeatureCall.gif
new file mode 100644
index 0000000..09b5568
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalAndExpression.gif
new file mode 100644
index 0000000..a32a7b5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalNotExpression.gif
new file mode 100644
index 0000000..b067e51
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalOrExpression.gif
new file mode 100644
index 0000000..e88df1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalRelationExpression.gif
new file mode 100644
index 0000000..b7adb36
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fa814dc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..0cf27b2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..d065203
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ParenthesizedExpression.gif
new file mode 100644
index 0000000..be1a550
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1329dce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ShiftExpression.gif
new file mode 100644
index 0000000..dd977db
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_TypeCastExpression.gif
new file mode 100644
index 0000000..da5f95c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_args_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_AssignmentExpression.gif
new file mode 100644
index 0000000..88d8844
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9a2424e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseOrExpression.gif
new file mode 100644
index 0000000..b9cd878
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseXorExpression.gif
new file mode 100644
index 0000000..e0a4541
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ConditionalExpression.gif
new file mode 100644
index 0000000..dd8ab8d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ElementReferenceExpression.gif
new file mode 100644
index 0000000..0a9ad1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_FeatureCall.gif
new file mode 100644
index 0000000..09b5568
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalAndExpression.gif
new file mode 100644
index 0000000..a32a7b5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalNotExpression.gif
new file mode 100644
index 0000000..b067e51
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalOrExpression.gif
new file mode 100644
index 0000000..e88df1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalRelationExpression.gif
new file mode 100644
index 0000000..b7adb36
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_MetaCall.gif
new file mode 100644
index 0000000..c022715
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fa814dc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..0cf27b2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..d065203
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ParenthesizedExpression.gif
new file mode 100644
index 0000000..be1a550
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..0cf27b2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1329dce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ShiftExpression.gif
new file mode 100644
index 0000000..dd977db
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_TypeCastExpression.gif
new file mode 100644
index 0000000..da5f95c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_UnaryExpression.gif
new file mode 100644
index 0000000..9144498
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateElementReferenceExpression_arraySelector_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_AssignmentExpression.gif
new file mode 100644
index 0000000..649a078
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseAndExpression.gif
new file mode 100644
index 0000000..0667806
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseOrExpression.gif
new file mode 100644
index 0000000..67cc320
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseXorExpression.gif
new file mode 100644
index 0000000..57a2f0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ConditionalExpression.gif
new file mode 100644
index 0000000..431ba00
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ElementReferenceExpression.gif
new file mode 100644
index 0000000..59d6727
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_Expression.gif
new file mode 100644
index 0000000..4344d57
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_FeatureCall.gif
new file mode 100644
index 0000000..ca17b1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalAndExpression.gif
new file mode 100644
index 0000000..3da98f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalNotExpression.gif
new file mode 100644
index 0000000..ac3a4fd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalOrExpression.gif
new file mode 100644
index 0000000..e6874a4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalRelationExpression.gif
new file mode 100644
index 0000000..2c570bf
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fefcd93
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..def961d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..59e174d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ParenthesizedExpression.gif
new file mode 100644
index 0000000..29f98e7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1808fc8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ShiftExpression.gif
new file mode 100644
index 0000000..ef6d3dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_TypeCastExpression.gif
new file mode 100644
index 0000000..fc69df4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_args_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_AssignmentExpression.gif
new file mode 100644
index 0000000..649a078
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseAndExpression.gif
new file mode 100644
index 0000000..0667806
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseOrExpression.gif
new file mode 100644
index 0000000..67cc320
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseXorExpression.gif
new file mode 100644
index 0000000..57a2f0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ConditionalExpression.gif
new file mode 100644
index 0000000..431ba00
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ElementReferenceExpression.gif
new file mode 100644
index 0000000..59d6727
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_FeatureCall.gif
new file mode 100644
index 0000000..ca17b1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalAndExpression.gif
new file mode 100644
index 0000000..3da98f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalNotExpression.gif
new file mode 100644
index 0000000..ac3a4fd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalOrExpression.gif
new file mode 100644
index 0000000..e6874a4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalRelationExpression.gif
new file mode 100644
index 0000000..2c570bf
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_MetaCall.gif
new file mode 100644
index 0000000..80e1a0d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fefcd93
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..def961d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..59e174d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ParenthesizedExpression.gif
new file mode 100644
index 0000000..29f98e7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..def961d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1808fc8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ShiftExpression.gif
new file mode 100644
index 0000000..ef6d3dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_TypeCastExpression.gif
new file mode 100644
index 0000000..fc69df4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_UnaryExpression.gif
new file mode 100644
index 0000000..bb5307e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_arraySelector_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_AssignmentExpression.gif
new file mode 100644
index 0000000..649a078
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseAndExpression.gif
new file mode 100644
index 0000000..0667806
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseOrExpression.gif
new file mode 100644
index 0000000..67cc320
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseXorExpression.gif
new file mode 100644
index 0000000..57a2f0a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ConditionalExpression.gif
new file mode 100644
index 0000000..431ba00
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ElementReferenceExpression.gif
new file mode 100644
index 0000000..59d6727
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_Expression.gif
new file mode 100644
index 0000000..4344d57
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_FeatureCall.gif
new file mode 100644
index 0000000..ca17b1c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalAndExpression.gif
new file mode 100644
index 0000000..3da98f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalNotExpression.gif
new file mode 100644
index 0000000..ac3a4fd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalOrExpression.gif
new file mode 100644
index 0000000..e6874a4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalRelationExpression.gif
new file mode 100644
index 0000000..2c570bf
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_MetaCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_MetaCall.gif
new file mode 100644
index 0000000..80e1a0d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_MetaCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fefcd93
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..def961d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..59e174d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ParenthesizedExpression.gif
new file mode 100644
index 0000000..29f98e7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_PostFixUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_PostFixUnaryExpression.gif
new file mode 100644
index 0000000..def961d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_PostFixUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..1808fc8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ShiftExpression.gif
new file mode 100644
index 0000000..ef6d3dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_TypeCastExpression.gif
new file mode 100644
index 0000000..fc69df4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_UnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_UnaryExpression.gif
new file mode 100644
index 0000000..bb5307e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateFeatureCall_owner_UnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..e8daccd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..542f33a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..c171fe0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..889a6dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..3c08924
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..3be3f93
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..0131b56
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..dd919f9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0091f17
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..a75fd20
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..6467d42
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..51bab8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..04e0ed5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..ca9caba
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..7faa8da
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..cece060
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..22bd4d1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..546db8b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..b3062f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..e8daccd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..542f33a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..c171fe0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..889a6dd
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..3c08924
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..3be3f93
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..0131b56
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..dd919f9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0091f17
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..a75fd20
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..6467d42
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..51bab8f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..04e0ed5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..ca9caba
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..7faa8da
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..cece060
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..22bd4d1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..546db8b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..b3062f7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalAndExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_AssignmentExpression.gif
new file mode 100644
index 0000000..ab5d6ae
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9abea5d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..8b2c545
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..135cbb0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ConditionalExpression.gif
new file mode 100644
index 0000000..5e8278c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..e2f4ed3
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_Expression.gif
new file mode 100644
index 0000000..834778f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_FeatureCall.gif
new file mode 100644
index 0000000..7b2c093
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalAndExpression.gif
new file mode 100644
index 0000000..6ed90b4
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalNotExpression.gif
new file mode 100644
index 0000000..8966d11
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalOrExpression.gif
new file mode 100644
index 0000000..e47a63a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..9d07d21
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..c7d5a0c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..3ca690b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..96aea64
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..762e109
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..a163af3
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ShiftExpression.gif
new file mode 100644
index 0000000..e93d4ee
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_TypeCastExpression.gif
new file mode 100644
index 0000000..6e66bf5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalNotExpression_operand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..a89d0ec
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9cc534c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..be1e90e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..1f7c356
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..99f2fe5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..1ebc244
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..de6af47
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..4e06b47
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0c84f38
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..7f7c51a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..2bd03ce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..0c1ee4c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..88ba66a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..655f0eb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..8247b72
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..54a8425
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..a382f74
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..2769bc6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..7c34939
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..a89d0ec
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..9cc534c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..be1e90e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..1f7c356
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..99f2fe5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..1ebc244
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..de6af47
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..4e06b47
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0c84f38
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..7f7c51a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..2bd03ce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..0c1ee4c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..88ba66a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..655f0eb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..8247b72
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..54a8425
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..a382f74
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..2769bc6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..7c34939
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalOrExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..a24e08f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..3129633
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..ae2d86d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..1479f92
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..11152e9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..e500955
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..4bf7d04
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..dcdfe25
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0d9f240
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..79c1899
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..5498173
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..6c339a5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fe9abb2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..07dea40
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..d7c738e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..3730559
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..f8935bb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..c0ed2a7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..76e6f3b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..a24e08f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..3129633
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..ae2d86d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..1479f92
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..11152e9
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..e500955
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..4bf7d04
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..dcdfe25
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..0d9f240
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..79c1899
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..5498173
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..6c339a5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..fe9abb2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..07dea40
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..d7c738e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..3730559
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..f8935bb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..c0ed2a7
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..76e6f3b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateLogicalRelationExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..c4524ef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..585fa35
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..85e7906
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..7eba7df
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..fb87467
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..fc1a2e8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..5a78e87
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..4c179d8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..27c2e4c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..be37fbc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..91619bc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..94665b1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..e07c4ed
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..0fb82fc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..628ea3f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..43637f5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..6cb3a27
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..41e42ed
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..cecc757
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..c4524ef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..585fa35
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..85e7906
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..7eba7df
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..fb87467
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..fc1a2e8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..5a78e87
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..4c179d8
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..27c2e4c
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..be37fbc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..91619bc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..94665b1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..e07c4ed
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..0fb82fc
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..628ea3f
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..43637f5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..6cb3a27
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..41e42ed
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..cecc757
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalAddSubtractExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..5236dce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..bd45e3e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..7ca3215
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..d1baa10
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..a57e119
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..53f75a5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_Expression.gif
new file mode 100644
index 0000000..6f31e09
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_FeatureCall.gif
new file mode 100644
index 0000000..12ba555
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..ddf2faa
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..f350f57
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..fd536c6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..baf4e8a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..e25ba66
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..799d63b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..fc17ce1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..3d22d79
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..7357039
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ShiftExpression.gif
new file mode 100644
index 0000000..89970fb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..aa6e67d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_leftOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_AssignmentExpression.gif
new file mode 100644
index 0000000..5236dce
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..bd45e3e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..7ca3215
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..d1baa10
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ConditionalExpression.gif
new file mode 100644
index 0000000..a57e119
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..53f75a5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_Expression.gif
new file mode 100644
index 0000000..6f31e09
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_FeatureCall.gif
new file mode 100644
index 0000000..12ba555
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalAndExpression.gif
new file mode 100644
index 0000000..ddf2faa
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalNotExpression.gif
new file mode 100644
index 0000000..f350f57
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalOrExpression.gif
new file mode 100644
index 0000000..fd536c6
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..baf4e8a
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..e25ba66
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..799d63b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..fc17ce1
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..3d22d79
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..7357039
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ShiftExpression.gif
new file mode 100644
index 0000000..89970fb
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_TypeCastExpression.gif
new file mode 100644
index 0000000..aa6e67d
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalMultiplyDivideExpression_rightOperand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_AssignmentExpression.gif
new file mode 100644
index 0000000..ebe3a48
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_AssignmentExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseAndExpression.gif
new file mode 100644
index 0000000..14d7832
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseOrExpression.gif
new file mode 100644
index 0000000..86ec735
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseXorExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseXorExpression.gif
new file mode 100644
index 0000000..224dcf0
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_BitwiseXorExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ConditionalExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ConditionalExpression.gif
new file mode 100644
index 0000000..5ef0e32
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ConditionalExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ElementReferenceExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ElementReferenceExpression.gif
new file mode 100644
index 0000000..c343c41
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ElementReferenceExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_Expression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_Expression.gif
new file mode 100644
index 0000000..b94380b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_Expression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_FeatureCall.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_FeatureCall.gif
new file mode 100644
index 0000000..817db0b
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_FeatureCall.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalAndExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalAndExpression.gif
new file mode 100644
index 0000000..ef98eb2
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalAndExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalNotExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalNotExpression.gif
new file mode 100644
index 0000000..7839cb5
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalNotExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalOrExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalOrExpression.gif
new file mode 100644
index 0000000..79a0a45
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalOrExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalRelationExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalRelationExpression.gif
new file mode 100644
index 0000000..7d35c89
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_LogicalRelationExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalAddSubtractExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalAddSubtractExpression.gif
new file mode 100644
index 0000000..8dafe0e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalAddSubtractExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalMultiplyDivideExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalMultiplyDivideExpression.gif
new file mode 100644
index 0000000..c2326ef
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalMultiplyDivideExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalUnaryExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalUnaryExpression.gif
new file mode 100644
index 0000000..f213cc3
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_NumericalUnaryExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ParenthesizedExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ParenthesizedExpression.gif
new file mode 100644
index 0000000..aebc983
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ParenthesizedExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_PrimitiveValueExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_PrimitiveValueExpression.gif
new file mode 100644
index 0000000..7f2d45e
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_PrimitiveValueExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ShiftExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ShiftExpression.gif
new file mode 100644
index 0000000..bbdaa35
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_ShiftExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_TypeCastExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_TypeCastExpression.gif
new file mode 100644
index 0000000..82b88ad
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateNumericalUnaryExpression_operand_TypeCastExpression.gif
Binary files differ
diff --git a/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateParenthesizedExpression_expression_AssignmentExpression.gif b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateParenthesizedExpression_expression_AssignmentExpression.gif
new file mode 100644
index 0000000..d524374
--- /dev/null
+++ b/org.yakindu.base.expressions.edit/icons/full/ctool16/CreateParenthesizedExpression_expression_AssignmentExpression.gif
Binary files differ
di