diff --git a/models/GetArguments/GetArguments.uml copy 2 b/models/GetArguments/GetArguments.uml copy 2
deleted file mode 100644
index 7c045b6..0000000
--- a/models/GetArguments/GetArguments.uml copy 2
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RTCppProperties="http:///schemas/RTCppProperties/_u3AaIJ9ZEeWtHskdthI1Bg/10" xmlns:UMLRealTime="http://www.eclipse.org/papyrus/umlrt" xmlns:UMLRealTimeStateMach="http://www.eclipse.org/papyrus/umlrt/statemachine" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RTCppProperties/_u3AaIJ9ZEeWtHskdthI1Bg/10 pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_u3BoQJ9ZEeWtHskdthI1Bg">
-  <uml:Model xmi:id="_McQnIJhcEeW6kuh42ZvZkQ" name="GetArguments">
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_iTNsUJhcEeW6kuh42ZvZkQ">
-      <importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/>
-    </packageImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_inU7IJhcEeW6kuh42ZvZkQ">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_mPjAgGXmEeS_4daqvwyFrg"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Class" xmi:id="_kailMJhcEeW6kuh42ZvZkQ" name="Top" classifierBehavior="_nwo-UJhcEeW6kuh42ZvZkQ" isActive="true">
-      <ownedAttribute xmi:type="uml:Port" xmi:id="_PHUNQJheEeW6kuh42ZvZkQ" name="log" visibility="protected" isOrdered="true" aggregation="composite" isBehavior="true" isService="false">
-        <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_2vWAAJhhEeW6kuh42ZvZkQ" name="wasDebug">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_-udLoJhhEeW6kuh42ZvZkQ"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_1lOSEJhoEeW6kuh42ZvZkQ" name="below1" visibility="protected" type="_WD4yQJhoEeW6kuh42ZvZkQ" isOrdered="true" aggregation="composite">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1lSjgZhoEeW6kuh42ZvZkQ" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1lTKkJhoEeW6kuh42ZvZkQ" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_BIV5gph1EeW6kuh42ZvZkQ" name="dbg" visibility="protected" type="_-BZxAJhkEeW6kuh42ZvZkQ" aggregation="shared" association="_BIVScJh1EeW6kuh42ZvZkQ"/>
-      <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_nwo-UJhcEeW6kuh42ZvZkQ" name="StateMachine" isReentrant="false">
-        <region xmi:type="uml:Region" xmi:id="_nwwTEJhcEeW6kuh42ZvZkQ" name="Region">
-          <subvertex xmi:type="uml:Pseudostate" xmi:id="_nw1LkJhcEeW6kuh42ZvZkQ">
-            <name xsi:nil="true"/>
-          </subvertex>
-        </region>
-      </ownedBehavior>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_-BZxAJhkEeW6kuh42ZvZkQ" name="DBG">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_GPYfEJhlEeW6kuh42ZvZkQ" name="isDebug" visibility="public" isLeaf="true" isStatic="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_utrfkJh1EeW6kuh42ZvZkQ" name="printTime" isLeaf="true" isStatic="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_791HAJh1EeW6kuh42ZvZkQ" name="printRelTime" isLeaf="true" isStatic="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_WD4yQJhoEeW6kuh42ZvZkQ" name="Below1" isActive="true">
-      <ownedAttribute xmi:type="uml:Port" xmi:id="_rXDN4JhoEeW6kuh42ZvZkQ" name="log" visibility="protected" isOrdered="true" aggregation="composite" isBehavior="true" isService="false">
-        <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Zn2LwJhpEeW6kuh42ZvZkQ" name="dbg" visibility="protected" type="_-BZxAJhkEeW6kuh42ZvZkQ" aggregation="shared"/>
-      <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_gGwlYJhoEeW6kuh42ZvZkQ" name="StateMachine" isReentrant="false">
-        <region xmi:type="uml:Region" xmi:id="_gGwlYZhoEeW6kuh42ZvZkQ" name="Region">
-          <transition xmi:type="uml:Transition" xmi:id="_gGwlYphoEeW6kuh42ZvZkQ" name="initial" source="_gGwlZphoEeW6kuh42ZvZkQ" target="_gGwlZ5hoEeW6kuh42ZvZkQ">
-            <effect xmi:type="uml:OpaqueBehavior" xmi:id="_gGwlY5hoEeW6kuh42ZvZkQ" name="initial">
-              <ownedComment xmi:type="uml:Comment" xmi:id="_gGwlZJhoEeW6kuh42ZvZkQ" annotatedElement="_gGwlZJhoEeW6kuh42ZvZkQ">
-                <body>UMLRT-CODEGEN:platform:/resource/GetArguments/GetArguments.uml#_gGwlaJhoEeW6kuh42ZvZkQ 
-    #define rtdata ( (void *)msg->getParam( 0 ) )
-    // generated code ends
-    log.show( &quot;In Below1, &quot;);
-
-    if ( DBG::isDebug ) {
-    	log.log(&quot;Debug is ON!&quot;);
-    	if (DBG::printTime) {
-    		log.show(&quot;printTime is true&quot;);
-    	} else {
-    		log.show(&quot;printTime is false&quot;);
-    	}
-    	if (DBG::printRelTime) {
-    		log.show(&quot;printRelTime is true&quot;);
-    	} else {
-    		log.show(&quot;printRelTime is false&quot;);
-    	}
-    } else {
-    	log.log(&quot;Debug is OFF!&quot;);
-    }
-    // the following code has been generated
-    #undef rtdata
-    // generated code ends
-}</body>
-              </ownedComment>
-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_tHSeoJh3EeW6kuh42ZvZkQ" name="msg"/>
-              <language>C++</language>
-              <body>log.log(&quot;Below1 initializing&quot;);</body>
-            </effect>
-          </transition>
-          <subvertex xmi:type="uml:Pseudostate" xmi:id="_gGwlZphoEeW6kuh42ZvZkQ">
-            <name xsi:nil="true"/>
-          </subvertex>
-          <subvertex xmi:type="uml:State" xmi:id="_gGwlZ5hoEeW6kuh42ZvZkQ" name="Running">
-            <entry xmi:type="uml:OpaqueBehavior" xmi:id="_gGwlaJhoEeW6kuh42ZvZkQ" name="Running_EN">
-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_tHPbUJh3EeW6kuh42ZvZkQ" name="msg"/>
-              <language>C++</language>
-              <body>log.show( &quot;In Below1, &quot;);
-
-if ( DBG::isDebug ) {
-	log.log(&quot;Debug is ON!&quot;);
-	if (DBG::printTime) {
-		log.log(&quot;printTime is true&quot;);
-	} else {
-		log.log(&quot;printTime is false&quot;);
-	}
-	if (DBG::printRelTime) {
-		log.log(&quot;printRelTime is true&quot;);
-	} else {
-		log.log(&quot;printRelTime is false&quot;);
-	}
-} else {
-	log.log(&quot;Debug is OFF!&quot;);
-}</body>
-            </entry>
-          </subvertex>
-        </region>
-      </ownedBehavior>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_BIVScJh1EeW6kuh42ZvZkQ" visibility="protected" memberEnd="_BIV5gph1EeW6kuh42ZvZkQ _BIWgkJh1EeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BIV5gJh1EeW6kuh42ZvZkQ" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BIV5gZh1EeW6kuh42ZvZkQ" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_BIWgkJh1EeW6kuh42ZvZkQ" name="top" type="_kailMJhcEeW6kuh42ZvZkQ" association="_BIVScJh1EeW6kuh42ZvZkQ"/>
-    </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_NAR6MJhcEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NAWysJhcEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt#/"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_1h74oEeVEeO0lv5O1DTHOQ"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_NGrdIJhcEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NGsrQJhcEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt/statemachine#/"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/UMLRealTimeSM-addendum.profile.uml#_KLcn0FDtEeOA4ecmvfqvaw"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_KOH0QJhfEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Q5VMKWlEeWQpteN6q2dUA" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VMaWlEeWQpteN6q2dUA" key="Version" value="0.0.11"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VMqWlEeWQpteN6q2dUA" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VM6WlEeWQpteN6q2dUA" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VNKWlEeWQpteN6q2dUA" key="Date" value="2015-12-10"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VNaWlEeWQpteN6q2dUA" key="Author" value=""/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KOIbUJhfEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_u3BoQJ9ZEeWtHskdthI1Bg"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_vl5LALs8EeSTjNEQkASznQ"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4cJgEJhhEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4cJgEZhhEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-    </profileApplication>
-  </uml:Model>
-  <UMLRealTime:Capsule xmi:id="_koBAgJhcEeW6kuh42ZvZkQ" base_Class="_kailMJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTPseudostate xmi:id="_nw5dAJhcEeW6kuh42ZvZkQ" base_Pseudostate="_nw1LkJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTRegion xmi:id="_nw7SMJhcEeW6kuh42ZvZkQ" base_Region="_nwwTEJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTStateMachine xmi:id="_nw8gUJhcEeW6kuh42ZvZkQ" base_StateMachine="_nwo-UJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:RTPort xmi:id="_PHX3oJheEeW6kuh42ZvZkQ" isWired="false" base_Port="_PHUNQJheEeW6kuh42ZvZkQ"/>
-  <RTCppProperties:CapsuleProperties xmi:id="_OSXFwJhfEeW6kuh42ZvZkQ" headerPreface="#include &quot;umlrtmain.hh&quot;&#xA;" base_Class="_kailMJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:Capsule xmi:id="_WEgdUJhoEeW6kuh42ZvZkQ" base_Class="_WD4yQJhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTStateMachine xmi:id="_gG020JhoEeW6kuh42ZvZkQ" base_StateMachine="_gGwlYJhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTRegion xmi:id="_gG1d4JhoEeW6kuh42ZvZkQ" base_Region="_gGwlYZhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTPseudostate xmi:id="_gG2E8JhoEeW6kuh42ZvZkQ" base_Pseudostate="_gGwlZphoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTState xmi:id="_gG2sAJhoEeW6kuh42ZvZkQ" base_State="_gGwlZ5hoEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:RTPort xmi:id="_rXG4QJhoEeW6kuh42ZvZkQ" isWired="false" base_Port="_rXDN4JhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:CapsulePart xmi:id="_1lSjgJhoEeW6kuh42ZvZkQ" base_Property="_1lOSEJhoEeW6kuh42ZvZkQ"/>
-</xmi:XMI>
diff --git a/models/GetArguments/GetArguments.uml copy 3 b/models/GetArguments/GetArguments.uml copy 3
deleted file mode 100644
index 89fd792..0000000
--- a/models/GetArguments/GetArguments.uml copy 3
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RTCppProperties="http:///schemas/RTCppProperties/_u3AaIJ9ZEeWtHskdthI1Bg/10" xmlns:UMLRealTime="http://www.eclipse.org/papyrus/umlrt" xmlns:UMLRealTimeStateMach="http://www.eclipse.org/papyrus/umlrt/statemachine" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RTCppProperties/_u3AaIJ9ZEeWtHskdthI1Bg/10 pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_u3BoQJ9ZEeWtHskdthI1Bg">
-  <uml:Model xmi:id="_McQnIJhcEeW6kuh42ZvZkQ" name="GetArguments">
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_iTNsUJhcEeW6kuh42ZvZkQ">
-      <importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/>
-    </packageImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_inU7IJhcEeW6kuh42ZvZkQ">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_mPjAgGXmEeS_4daqvwyFrg"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Class" xmi:id="_kailMJhcEeW6kuh42ZvZkQ" name="Top" classifierBehavior="_nwo-UJhcEeW6kuh42ZvZkQ" isActive="true">
-      <ownedAttribute xmi:type="uml:Port" xmi:id="_PHUNQJheEeW6kuh42ZvZkQ" name="log" visibility="protected" isOrdered="true" aggregation="composite" isBehavior="true" isService="false">
-        <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_2vWAAJhhEeW6kuh42ZvZkQ" name="wasDebug">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_-udLoJhhEeW6kuh42ZvZkQ"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_1lOSEJhoEeW6kuh42ZvZkQ" name="below1" visibility="protected" type="_WD4yQJhoEeW6kuh42ZvZkQ" isOrdered="true" aggregation="composite">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1lSjgZhoEeW6kuh42ZvZkQ" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1lTKkJhoEeW6kuh42ZvZkQ" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A_7n4KW8EeWN9JTg-IMukA" name="dbg" type="_-BZxAJhkEeW6kuh42ZvZkQ">
-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_FHEcYKW8EeWN9JTg-IMukA"/>
-      </ownedAttribute>
-      <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_nwo-UJhcEeW6kuh42ZvZkQ" name="StateMachine" isReentrant="false">
-        <region xmi:type="uml:Region" xmi:id="_nwwTEJhcEeW6kuh42ZvZkQ" name="Region">
-          <transition xmi:type="uml:Transition" xmi:id="_xnB0oJhcEeW6kuh42ZvZkQ" name="initial" source="_nw1LkJhcEeW6kuh42ZvZkQ" target="_vPgjoJhcEeW6kuh42ZvZkQ">
-            <effect xmi:type="uml:OpaqueBehavior" xmi:id="_v2tREJhdEeW6kuh42ZvZkQ" name="initial">
-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzPtoJhkEeW6kuh42ZvZkQ" annotatedElement="_wzPtoJhkEeW6kuh42ZvZkQ">
-                <body>UMLRT-CODEGEN:platform:/resource/GetArguments/GetArguments.uml#_sC6LIJhkEeW6kuh42ZvZkQ 
-    #define rtdata ( (void *)msg->getParam( 0 ) )
-    // generated code ends
-    log.log( &quot;In Top, &quot;);
-    if ( DBG::isDebug ) {
-    	log.log(&quot;Debug is ON!&quot;);
-    } else {
-    	log.log(&quot;Debug is OFF!&quot;);
-    }
-    // the following code has been generated
-    #undef rtdata
-    // generated code ends
-}</body>
-              </ownedComment>
-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZKeAUJh2EeW6kuh42ZvZkQ" name="msg"/>
-              <language>C++</language>
-              <body>int numArgs = 0;
-
-DBG::isDebug = false;
-DBG::printTime = false;
-DBG::printRelTime = false;
-
-numArgs = UMLRTMain::getArgCount();
-
-for ( int i = 0; i &lt; numArgs; i++ ) {
-	switch ( UMLRTMain::getArg(i)[0] ) {
-		case 'D' :
-		case 'd' :
-			DBG::isDebug = true;
-			break;
-		case 'T' :
-		case 't' :
-			DBG::printTime = true;
-			if ( DBG::isDebug ) {
-				log.log(&quot;Should print time!&quot;);
-			}
-			break;
-		case 'R' :
-		case 'r' :
-			DBG::printRelTime = true;
-			if ( DBG::isDebug ) {
-				log.log(&quot;Should print relative time!&quot;);
-			}
-			break;
-	}
-}
-
-if ( DBG::isDebug ) {
-	log.show (&quot;Number of arguments: &quot;);
-	log.log( numArgs );
-	for ( int i = 0; i &lt; numArgs; i++ ) {
-		log.show( &quot;Args(&quot; );
-		log.show( i );
-		log.show( &quot; ) = &quot; );
-		(log.log( UMLRTMain::getArg( i ) ));
-	}
-}</body>
-            </effect>
-          </transition>
-          <subvertex xmi:type="uml:Pseudostate" xmi:id="_nw1LkJhcEeW6kuh42ZvZkQ">
-            <name xsi:nil="true"/>
-          </subvertex>
-          <subvertex xmi:type="uml:State" xmi:id="_vPgjoJhcEeW6kuh42ZvZkQ" name="Running">
-            <entry xmi:type="uml:OpaqueBehavior" xmi:id="_sC6LIJhkEeW6kuh42ZvZkQ" name="Running_EN">
-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZKa9AJh2EeW6kuh42ZvZkQ" name="msg"/>
-              <language>C++</language>
-              <body>log.log( &quot;In Top, &quot;);
-if ( DBG::isDebug ) {
-	log.log(&quot;Debug is ON!&quot;);
-} else {
-	log.log(&quot;Debug is OFF!&quot;);
-}</body>
-            </entry>
-          </subvertex>
-        </region>
-      </ownedBehavior>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_-BZxAJhkEeW6kuh42ZvZkQ" name="DBG">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_GPYfEJhlEeW6kuh42ZvZkQ" name="isDebug" visibility="public" isLeaf="true" isStatic="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_utrfkJh1EeW6kuh42ZvZkQ" name="printTime" isLeaf="true" isStatic="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_791HAJh1EeW6kuh42ZvZkQ" name="printRelTime" isLeaf="true" isStatic="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_WD4yQJhoEeW6kuh42ZvZkQ" name="Below1" isActive="true">
-      <ownedAttribute xmi:type="uml:Port" xmi:id="_rXDN4JhoEeW6kuh42ZvZkQ" name="log" visibility="protected" isOrdered="true" aggregation="composite" isBehavior="true" isService="false">
-        <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Zn2LwJhpEeW6kuh42ZvZkQ" name="dbg" visibility="private" type="_-BZxAJhkEeW6kuh42ZvZkQ" aggregation="shared"/>
-      <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_gGwlYJhoEeW6kuh42ZvZkQ" name="StateMachine" isReentrant="false">
-        <region xmi:type="uml:Region" xmi:id="_gGwlYZhoEeW6kuh42ZvZkQ" name="Region">
-          <transition xmi:type="uml:Transition" xmi:id="_gGwlYphoEeW6kuh42ZvZkQ" name="initial" source="_gGwlZphoEeW6kuh42ZvZkQ" target="_gGwlZ5hoEeW6kuh42ZvZkQ">
-            <effect xmi:type="uml:OpaqueBehavior" xmi:id="_gGwlY5hoEeW6kuh42ZvZkQ" name="initial">
-              <ownedComment xmi:type="uml:Comment" xmi:id="_gGwlZJhoEeW6kuh42ZvZkQ" annotatedElement="_gGwlZJhoEeW6kuh42ZvZkQ">
-                <body>UMLRT-CODEGEN:platform:/resource/GetArguments/GetArguments.uml#_gGwlaJhoEeW6kuh42ZvZkQ 
-    #define rtdata ( (void *)msg->getParam( 0 ) )
-    // generated code ends
-    log.show( &quot;In Below1, &quot;);
-
-    if ( DBG::isDebug ) {
-    	log.log(&quot;Debug is ON!&quot;);
-    	if (DBG::printTime) {
-    		log.show(&quot;printTime is true&quot;);
-    	} else {
-    		log.show(&quot;printTime is false&quot;);
-    	}
-    	if (DBG::printRelTime) {
-    		log.show(&quot;printRelTime is true&quot;);
-    	} else {
-    		log.show(&quot;printRelTime is false&quot;);
-    	}
-    } else {
-    	log.log(&quot;Debug is OFF!&quot;);
-    }
-    // the following code has been generated
-    #undef rtdata
-    // generated code ends
-}</body>
-              </ownedComment>
-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_tHSeoJh3EeW6kuh42ZvZkQ" name="msg"/>
-              <language>C++</language>
-              <body>log.log(&quot;Below1 initializing&quot;);</body>
-            </effect>
-          </transition>
-          <subvertex xmi:type="uml:Pseudostate" xmi:id="_gGwlZphoEeW6kuh42ZvZkQ">
-            <name xsi:nil="true"/>
-          </subvertex>
-          <subvertex xmi:type="uml:State" xmi:id="_gGwlZ5hoEeW6kuh42ZvZkQ" name="Running">
-            <entry xmi:type="uml:OpaqueBehavior" xmi:id="_gGwlaJhoEeW6kuh42ZvZkQ" name="Running_EN">
-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_tHPbUJh3EeW6kuh42ZvZkQ" name="msg"/>
-              <language>C++</language>
-              <body>log.show( &quot;In Below1, &quot;);
-
-if ( DBG::isDebug ) {
-	log.log(&quot;Debug is ON!&quot;);
-	if (DBG::printTime) {
-		log.log(&quot;printTime is true&quot;);
-	} else {
-		log.log(&quot;printTime is false&quot;);
-	}
-	if (DBG::printRelTime) {
-		log.log(&quot;printRelTime is true&quot;);
-	} else {
-		log.log(&quot;printRelTime is false&quot;);
-	}
-} else {
-	log.log(&quot;Debug is OFF!&quot;);
-}</body>
-            </entry>
-          </subvertex>
-        </region>
-      </ownedBehavior>
-    </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_NAR6MJhcEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NAWysJhcEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt#/"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_1h74oEeVEeO0lv5O1DTHOQ"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_NGrdIJhcEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NGsrQJhcEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt/statemachine#/"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/UMLRealTimeSM-addendum.profile.uml#_KLcn0FDtEeOA4ecmvfqvaw"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_KOH0QJhfEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_erqGYKW7EeWN9JTg-IMukA" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_erqGYaW7EeWN9JTg-IMukA" key="Version" value="0.0.11"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_erqGYqW7EeWN9JTg-IMukA" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_erqGY6W7EeWN9JTg-IMukA" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_erqGZKW7EeWN9JTg-IMukA" key="Date" value="2015-12-10"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_erqGZaW7EeWN9JTg-IMukA" key="Author" value=""/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KOIbUJhfEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_u3BoQJ9ZEeWtHskdthI1Bg"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_vl5LALs8EeSTjNEQkASznQ"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4cJgEJhhEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4cJgEZhhEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-    </profileApplication>
-  </uml:Model>
-  <UMLRealTime:Capsule xmi:id="_koBAgJhcEeW6kuh42ZvZkQ" base_Class="_kailMJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTPseudostate xmi:id="_nw5dAJhcEeW6kuh42ZvZkQ" base_Pseudostate="_nw1LkJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTRegion xmi:id="_nw7SMJhcEeW6kuh42ZvZkQ" base_Region="_nwwTEJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTStateMachine xmi:id="_nw8gUJhcEeW6kuh42ZvZkQ" base_StateMachine="_nwo-UJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTState xmi:id="_vPkOAJhcEeW6kuh42ZvZkQ" base_State="_vPgjoJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:RTPort xmi:id="_PHX3oJheEeW6kuh42ZvZkQ" isWired="false" base_Port="_PHUNQJheEeW6kuh42ZvZkQ"/>
-  <RTCppProperties:CapsuleProperties xmi:id="_OSXFwJhfEeW6kuh42ZvZkQ" headerPreface="#include &quot;umlrtmain.hh&quot;&#xA;" base_Class="_kailMJhcEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:Capsule xmi:id="_WEgdUJhoEeW6kuh42ZvZkQ" base_Class="_WD4yQJhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTStateMachine xmi:id="_gG020JhoEeW6kuh42ZvZkQ" base_StateMachine="_gGwlYJhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTRegion xmi:id="_gG1d4JhoEeW6kuh42ZvZkQ" base_Region="_gGwlYZhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTPseudostate xmi:id="_gG2E8JhoEeW6kuh42ZvZkQ" base_Pseudostate="_gGwlZphoEeW6kuh42ZvZkQ"/>
-  <UMLRealTimeStateMach:RTState xmi:id="_gG2sAJhoEeW6kuh42ZvZkQ" base_State="_gGwlZ5hoEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:RTPort xmi:id="_rXG4QJhoEeW6kuh42ZvZkQ" isWired="false" base_Port="_rXDN4JhoEeW6kuh42ZvZkQ"/>
-  <UMLRealTime:CapsulePart xmi:id="_1lSjgJhoEeW6kuh42ZvZkQ" base_Property="_1lOSEJhoEeW6kuh42ZvZkQ"/>
-</xmi:XMI>
diff --git a/models/samples/GetArguments/GetArguments.notation b/models/samples/GetArguments/GetArguments.notation
index 2716083..0bb3a41 100644
--- a/models/samples/GetArguments/GetArguments.notation
+++ b/models/samples/GetArguments/GetArguments.notation
@@ -210,6 +210,14 @@
           <element xmi:type="uml:Region" href="GetArguments.uml#_nwwTEJhcEeW6kuh42ZvZkQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nxq5GphcEeW6kuh42ZvZkQ" width="320" height="237"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_KdS24KmxEeWEXOiRnj2ETQ" type="StereotypeComment">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_KdS24amxEeWEXOiRnj2ETQ" showTitle="true"/>
+          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KdTd8KmxEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+            <eObjectValue xmi:type="uml:Region" href="GetArguments.uml#_nwwTEJhcEeW6kuh42ZvZkQ"/>
+          </styles>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdS24qmxEeWEXOiRnj2ETQ" x="200"/>
+        </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nxq5G5hcEeW6kuh42ZvZkQ" y="16" width="320" height="237"/>
       </children>
       <styles xmi:type="notation:CanonicalStyle" xmi:id="_hwnsMKW7EeWN9JTg-IMukA"/>
@@ -267,6 +275,16 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p4V54KW-EeWN9JTg-IMukA" id="(1.0,0.95)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p4V54aW-EeWN9JTg-IMukA" id="(0.11578947368421053,0.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_KdTd8amxEeWEXOiRnj2ETQ" type="StereotypeCommentLink" source="_nxq5FZhcEeW6kuh42ZvZkQ" target="_KdS24KmxEeWEXOiRnj2ETQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_KdTd8qmxEeWEXOiRnj2ETQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_KdTd9qmxEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Region" href="GetArguments.uml#_nwwTEJhcEeW6kuh42ZvZkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KdTd86mxEeWEXOiRnj2ETQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KdTd9KmxEeWEXOiRnj2ETQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KdTd9amxEeWEXOiRnj2ETQ"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_WEeBEJhoEeW6kuh42ZvZkQ" type="CompositeStructure" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_WEeoIJhoEeW6kuh42ZvZkQ" type="2073">
@@ -626,10 +644,6 @@
           <element xmi:type="uml:Property" href="GetArguments.uml#_1lOSEJhoEeW6kuh42ZvZkQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_4fqycafpEeW8EbqHxgSu9A"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_KaVu0KgXEeWGg7h3jLnwpQ" type="3012">
-          <element xmi:type="uml:Property" href="GetArguments.uml#_KaECAKgXEeWGg7h3jLnwpQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_KaVu0agXEeWGg7h3jLnwpQ"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_2lF8IqfpEeW8EbqHxgSu9A"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_2lF8I6fpEeW8EbqHxgSu9A"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_2lF8JKfpEeW8EbqHxgSu9A"/>
@@ -649,7 +663,7 @@
       </children>
       <styles xmi:type="notation:CanonicalStyle" xmi:id="_4fnvIKfpEeW8EbqHxgSu9A"/>
       <element xmi:type="uml:Class" href="GetArguments.uml#_kailMJhcEeW6kuh42ZvZkQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2lFVEafpEeW8EbqHxgSu9A" x="106" y="84"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2lFVEafpEeW8EbqHxgSu9A" x="75" y="78"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2lPGEKfpEeW8EbqHxgSu9A" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_2lPGEafpEeW8EbqHxgSu9A" showTitle="true"/>
@@ -659,6 +673,183 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2lPGEqfpEeW8EbqHxgSu9A" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_i5maQKmcEeWEXOiRnj2ETQ" type="2008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yaPdoKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yaPdoamcEeWEXOiRnj2ETQ" key="canonical" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i5oPcKmcEeWEXOiRnj2ETQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_i5oPcamcEeWEXOiRnj2ETQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_i5oPcqmcEeWEXOiRnj2ETQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_i5o2gKmcEeWEXOiRnj2ETQ" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ybeMsKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ybeMsamcEeWEXOiRnj2ETQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_yaSg8KmcEeWEXOiRnj2ETQ" type="3012">
+          <element xmi:type="uml:Port" href="GetArguments.uml#_rXDN4JhoEeW6kuh42ZvZkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_yaSg8amcEeWEXOiRnj2ETQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_i5o2gamcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_i5o2gqmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_i5o2g6mcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5o2hKmcEeWEXOiRnj2ETQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_i5o2hamcEeWEXOiRnj2ETQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_i5o2hqmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_i5o2h6mcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_i5o2iKmcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5o2iamcEeWEXOiRnj2ETQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_i5o2iqmcEeWEXOiRnj2ETQ" visible="false" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ybezwKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ybfa0KmcEeWEXOiRnj2ETQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_yac5AKmcEeWEXOiRnj2ETQ" type="3014">
+          <element xmi:type="uml:StateMachine" href="GetArguments.uml#_gGwlYJhoEeW6kuh42ZvZkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_yac5AamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_i5o2i6mcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_i5o2jKmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_i5o2jamcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5o2jqmcEeWEXOiRnj2ETQ"/>
+      </children>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_yaOPgKmcEeWEXOiRnj2ETQ"/>
+      <element xmi:type="uml:Class" href="GetArguments.uml#_WD4yQJhoEeW6kuh42ZvZkQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5maQamcEeWEXOiRnj2ETQ" x="437" y="89"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_i5wLQ6mcEeWEXOiRnj2ETQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i5wLRKmcEeWEXOiRnj2ETQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_i5wLRqmcEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="GetArguments.uml#_WD4yQJhoEeW6kuh42ZvZkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5wLRamcEeWEXOiRnj2ETQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_3O3DMKmcEeWEXOiRnj2ETQ" type="2008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5inOgKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5inOgamcEeWEXOiRnj2ETQ" key="canonical" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3O3qQKmcEeWEXOiRnj2ETQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3O3qQamcEeWEXOiRnj2ETQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3O3qQqmcEeWEXOiRnj2ETQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_3O3qQ6mcEeWEXOiRnj2ETQ" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5kQ0UKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5kQ0UamcEeWEXOiRnj2ETQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_5ipqwKmcEeWEXOiRnj2ETQ" type="3012">
+          <element xmi:type="uml:Property" href="GetArguments.uml#_XQSjAagWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5ipqwamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_5iqR0KmcEeWEXOiRnj2ETQ" type="3012">
+          <element xmi:type="uml:Property" href="GetArguments.uml#_XQSjAqgWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5iqR0amcEeWEXOiRnj2ETQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_3O3qRKmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_3O3qRamcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_3O3qRqmcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3O3qR6mcEeWEXOiRnj2ETQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_3O3qSKmcEeWEXOiRnj2ETQ" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5kSCcKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5kSCcamcEeWEXOiRnj2ETQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_5iwYcKmcEeWEXOiRnj2ETQ" type="3013">
+          <element xmi:type="uml:Operation" href="GetArguments.uml#_XQSjB6gWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5iwYcamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_5iwYcqmcEeWEXOiRnj2ETQ" type="3013">
+          <element xmi:type="uml:Operation" href="GetArguments.uml#_XQSjCagWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5iwYc6mcEeWEXOiRnj2ETQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_5iw_gKmcEeWEXOiRnj2ETQ" type="3013">
+          <element xmi:type="uml:Operation" href="GetArguments.uml#_XQSjC6gWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5iw_gamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_5ixmkKmcEeWEXOiRnj2ETQ" type="3013">
+          <element xmi:type="uml:Operation" href="GetArguments.uml#_XQSjDagWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_5ixmkamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_3O4RUKmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_3O4RUamcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_3O4RUqmcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3O4RU6mcEeWEXOiRnj2ETQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_3O4RVKmcEeWEXOiRnj2ETQ" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_3O4RVamcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_3O4RVqmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_3O4RV6mcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3O4RWKmcEeWEXOiRnj2ETQ"/>
+      </children>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_5imncKmcEeWEXOiRnj2ETQ"/>
+      <element xmi:type="uml:Class" href="GetArguments.uml#_XQSjAKgWEeWGg7h3jLnwpQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3O3DMamcEeWEXOiRnj2ETQ" x="218" y="291"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7XOmwKmcEeWEXOiRnj2ETQ" type="2006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8gEeIKmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8gEeIamcEeWEXOiRnj2ETQ" key="canonical" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7XOmwqmcEeWEXOiRnj2ETQ" type="5023"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7XPN0KmcEeWEXOiRnj2ETQ" type="8508">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7XPN0amcEeWEXOiRnj2ETQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7XPN0qmcEeWEXOiRnj2ETQ" type="7015">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8jtA8KmcEeWEXOiRnj2ETQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8jtA8amcEeWEXOiRnj2ETQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_8is7YKmcEeWEXOiRnj2ETQ" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="GetArguments.uml#_XQXbgagWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8is7YamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_8iticKmcEeWEXOiRnj2ETQ" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="GetArguments.uml#_XQXbgqgWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8iticamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_8iuJgKmcEeWEXOiRnj2ETQ" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="GetArguments.uml#_XQXbg6gWEeWGg7h3jLnwpQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_8iuJgamcEeWEXOiRnj2ETQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7XPN06mcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7XPN1KmcEeWEXOiRnj2ETQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7XPN1amcEeWEXOiRnj2ETQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7XPN1qmcEeWEXOiRnj2ETQ"/>
+      </children>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_8gD3EKmcEeWEXOiRnj2ETQ"/>
+      <element xmi:type="uml:Enumeration" href="GetArguments.uml#_XQXbgKgWEeWGg7h3jLnwpQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7XOmwamcEeWEXOiRnj2ETQ" x="629" y="311"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_C-GRg6mdEeWEXOiRnj2ETQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_C-GRhKmdEeWEXOiRnj2ETQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_C-GRhqmdEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Usage" href="GetArguments.uml#_XQYCkKgWEeWGg7h3jLnwpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-GRhamdEeWEXOiRnj2ETQ" x="418" y="191"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_I1-D06mdEeWEXOiRnj2ETQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_I1-D1KmdEeWEXOiRnj2ETQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_I1-q4KmdEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Usage" href="GetArguments.uml#_HSnasKmdEeWEXOiRnj2ETQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I1-D1amdEeWEXOiRnj2ETQ" x="306" y="-16"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MhUUM6mdEeWEXOiRnj2ETQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MhUUNKmdEeWEXOiRnj2ETQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MhUUNqmdEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Usage" href="GetArguments.uml#_KpIqkKmdEeWEXOiRnj2ETQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MhUUNamdEeWEXOiRnj2ETQ" x="578" y="-11"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_AwWToKm1EeWEXOiRnj2ETQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_AwWToam1EeWEXOiRnj2ETQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AwWTo6m1EeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="GetArguments.uml#_XQSjAKgWEeWGg7h3jLnwpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwWToqm1EeWEXOiRnj2ETQ" x="418" y="291"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_0aKVoafpEeW8EbqHxgSu9A" name="diagram_compatibility_version" stringValue="1.1.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_0aKVoqfpEeW8EbqHxgSu9A"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_0aKVo6fpEeW8EbqHxgSu9A">
@@ -675,5 +866,94 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2lPGF6fpEeW8EbqHxgSu9A"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2lPGGKfpEeW8EbqHxgSu9A"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_i5wLR6mcEeWEXOiRnj2ETQ" type="StereotypeCommentLink" source="_i5maQKmcEeWEXOiRnj2ETQ" target="_i5wLQ6mcEeWEXOiRnj2ETQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_i5wLSKmcEeWEXOiRnj2ETQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_i5wyUKmcEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="GetArguments.uml#_WD4yQJhoEeW6kuh42ZvZkQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i5wLSamcEeWEXOiRnj2ETQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i5wLSqmcEeWEXOiRnj2ETQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i5wLS6mcEeWEXOiRnj2ETQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__iGrwKmcEeWEXOiRnj2ETQ" type="4007" source="_3O3DMKmcEeWEXOiRnj2ETQ" target="_7XOmwKmcEeWEXOiRnj2ETQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="__iHS0KmcEeWEXOiRnj2ETQ" type="6016">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__iHS0amcEeWEXOiRnj2ETQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__iHS0qmcEeWEXOiRnj2ETQ" type="6017">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__iHS06mcEeWEXOiRnj2ETQ" x="-4" y="17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__iGrwamcEeWEXOiRnj2ETQ"/>
+      <element xmi:type="uml:Usage" href="GetArguments.uml#_XQYCkKgWEeWGg7h3jLnwpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__iGrwqmcEeWEXOiRnj2ETQ" points="[116, -15, -119, 14]$[185, -23, -50, 6]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A0YzAKmdEeWEXOiRnj2ETQ" id="(1.0,0.48125)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A0YzAamdEeWEXOiRnj2ETQ" id="(0.0,0.57)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_C-GRh6mdEeWEXOiRnj2ETQ" type="StereotypeCommentLink" source="__iGrwKmcEeWEXOiRnj2ETQ" target="_C-GRg6mdEeWEXOiRnj2ETQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_C-GRiKmdEeWEXOiRnj2ETQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_C-GRjKmdEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Usage" href="GetArguments.uml#_XQYCkKgWEeWGg7h3jLnwpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C-GRiamdEeWEXOiRnj2ETQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C-GRiqmdEeWEXOiRnj2ETQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C-GRi6mdEeWEXOiRnj2ETQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HTTXMKmdEeWEXOiRnj2ETQ" type="4007" source="_2lFVEKfpEeW8EbqHxgSu9A" target="_3O3DMKmcEeWEXOiRnj2ETQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HTT-QKmdEeWEXOiRnj2ETQ" type="6016">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HTT-QamdEeWEXOiRnj2ETQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HTT-QqmdEeWEXOiRnj2ETQ" type="6017">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HTT-Q6mdEeWEXOiRnj2ETQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HTTXMamdEeWEXOiRnj2ETQ"/>
+      <element xmi:type="uml:Usage" href="GetArguments.uml#_HSnasKmdEeWEXOiRnj2ETQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HTTXMqmdEeWEXOiRnj2ETQ" points="[7, 33, -72, -155]$[-36, 110, -115, -78]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HT-FkKmdEeWEXOiRnj2ETQ" id="(0.7948717948717948,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HT-soKmdEeWEXOiRnj2ETQ" id="(0.2554112554112554,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_I1-q4amdEeWEXOiRnj2ETQ" type="StereotypeCommentLink" source="_HTTXMKmdEeWEXOiRnj2ETQ" target="_I1-D06mdEeWEXOiRnj2ETQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_I1-q4qmdEeWEXOiRnj2ETQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_I1-q5qmdEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Usage" href="GetArguments.uml#_HSnasKmdEeWEXOiRnj2ETQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I1-q46mdEeWEXOiRnj2ETQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I1-q5KmdEeWEXOiRnj2ETQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I1-q5amdEeWEXOiRnj2ETQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_KpNjEKmdEeWEXOiRnj2ETQ" type="4007" source="_i5maQKmcEeWEXOiRnj2ETQ" target="_3O3DMKmcEeWEXOiRnj2ETQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_KpNjE6mdEeWEXOiRnj2ETQ" type="6016">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KpNjFKmdEeWEXOiRnj2ETQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KpNjFamdEeWEXOiRnj2ETQ" type="6017">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KpNjFqmdEeWEXOiRnj2ETQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_KpNjEamdEeWEXOiRnj2ETQ"/>
+      <element xmi:type="uml:Usage" href="GetArguments.uml#_KpIqkKmdEeWEXOiRnj2ETQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KpNjEqmdEeWEXOiRnj2ETQ" points="[-11, 25, 50, -119]$[-26, 111, 35, -33]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kp_mMKmdEeWEXOiRnj2ETQ" id="(0.40875912408759124,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kp_mMamdEeWEXOiRnj2ETQ" id="(0.7748917748917749,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MhUUN6mdEeWEXOiRnj2ETQ" type="StereotypeCommentLink" source="_KpNjEKmdEeWEXOiRnj2ETQ" target="_MhUUM6mdEeWEXOiRnj2ETQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MhUUOKmdEeWEXOiRnj2ETQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MhU7QqmdEeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Usage" href="GetArguments.uml#_KpIqkKmdEeWEXOiRnj2ETQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MhUUOamdEeWEXOiRnj2ETQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MhU7QKmdEeWEXOiRnj2ETQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MhU7QamdEeWEXOiRnj2ETQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_AwWTpKm1EeWEXOiRnj2ETQ" type="StereotypeCommentLink" source="_3O3DMKmcEeWEXOiRnj2ETQ" target="_AwWToKm1EeWEXOiRnj2ETQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_AwWTpam1EeWEXOiRnj2ETQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AwWTqam1EeWEXOiRnj2ETQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="GetArguments.uml#_XQSjAKgWEeWGg7h3jLnwpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AwWTpqm1EeWEXOiRnj2ETQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AwWTp6m1EeWEXOiRnj2ETQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AwWTqKm1EeWEXOiRnj2ETQ"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/models/samples/GetArguments/GetArguments.uml b/models/samples/GetArguments/GetArguments.uml
index f4c3034..9a12390 100644
--- a/models/samples/GetArguments/GetArguments.uml
+++ b/models/samples/GetArguments/GetArguments.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RTCppProperties="http:///schemas/RTCppProperties/_xXduQFiYEeWkUszwrjRJag/6" xmlns:UMLRealTime="http://www.eclipse.org/papyrus/umlrt" xmlns:UMLRealTimeStateMach="http://www.eclipse.org/papyrus/umlrt/statemachine" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RTCppProperties/_xXduQFiYEeWkUszwrjRJag/6 pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_xXe8YFiYEeWkUszwrjRJag">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RTCppProperties="http:///schemas/RTCppProperties/_u3AaIJ9ZEeWtHskdthI1Bg/10" xmlns:UMLRealTime="http://www.eclipse.org/papyrus/umlrt" xmlns:UMLRealTimeStateMach="http://www.eclipse.org/papyrus/umlrt/statemachine" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RTCppProperties/_u3AaIJ9ZEeWtHskdthI1Bg/10 pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_u3BoQJ9ZEeWtHskdthI1Bg">
   <uml:Model xmi:id="_McQnIJhcEeW6kuh42ZvZkQ" name="GetArguments">
     <packageImport xmi:type="uml:PackageImport" xmi:id="_iTNsUJhcEeW6kuh42ZvZkQ">
       <importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/>
@@ -15,59 +15,22 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1lSjgZhoEeW6kuh42ZvZkQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1lTKkJhoEeW6kuh42ZvZkQ" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_KaECAKgXEeWGg7h3jLnwpQ" name="dbg" visibility="protected" type="_XQSjAKgWEeWGg7h3jLnwpQ"/>
       <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_nwo-UJhcEeW6kuh42ZvZkQ" name="StateMachine" isReentrant="false">
         <region xmi:type="uml:Region" xmi:id="_nwwTEJhcEeW6kuh42ZvZkQ" name="Region">
           <transition xmi:type="uml:Transition" xmi:id="_p3V0UKW-EeWN9JTg-IMukA" name="TopInitial" source="_nw1LkJhcEeW6kuh42ZvZkQ" target="_mtrUsKW-EeWN9JTg-IMukA">
             <effect xmi:type="uml:OpaqueBehavior" xmi:id="_-DasEKW-EeWN9JTg-IMukA" name="initializeTop">
               <language>C++</language>
-              <body>int numArgs = 0;
+              <body>log.log( &quot;initializeTop&quot; );
+
+int numArgs = 0;
 char argVal;
 
-DBG::isDebug = false;
-DBG::printTime = false;
-DBG::printRelTime = false;
+dbg.setDebug( false );
+dbg.setPrintType( PrintActual );
 
 numArgs = UMLRTMain::getArgCount();
 
-for ( int i = 0; i &lt; numArgs; i++ ) {
-	if  ( UMLRTMain::getArg(i)[0] == '-' ) {
-		argVal = UMLRTMain::getArg(i)[1];
-		switch ( argVal ) {
-			case 'D' :
-			case 'd' :
-				DBG::isDebug = true;
-				break;
-			case 'T' :
-			case 't' :
-				DBG::printTime = true;
-				if ( DBG::isDebug ) {
-					log.log(&quot;Should print time!&quot;);
-				}
-				break;
-			case 'R' :
-			case 'r' :
-				DBG::printRelTime = true;
-				if ( DBG::isDebug ) {
-					log.log(&quot;Should print relative time!&quot;);
-				}
-				break;
-			default:
-				if ( DBG::isDebug ) {
-					log.show( &quot;Unrecognized argument: &quot; );
-					log.log( argVal );
-				}
-				break;
-		}
-	} else {
-		if ( DBG::isDebug ) {
-			log.show( &quot;Argument value: &quot; );
-			log.log( UMLRTMain::getArg(i) );
-		}
-	}
-}
-
-if ( DBG::isDebug ) {
+if ( numArgs > 0 ) {
 	log.show (&quot;Number of arguments: &quot;);
 	log.log( numArgs );
 	for ( int i = 0; i &lt; numArgs; i++ ) {
@@ -76,6 +39,47 @@
 		log.show( &quot; ) = &quot; );
 		(log.log( UMLRTMain::getArg( i ) ));
 	}
+} else {
+	log.log( &quot;No user arguments&quot; );
+}
+
+for ( int i = 0; i &lt; numArgs; i++ ) {
+	if  ( UMLRTMain::getArg(i)[0] == '-' ) {
+		argVal = UMLRTMain::getArg(i)[1];
+		log.show( &quot;argument: &quot;); log.log( argVal );
+		switch ( argVal ) {
+			case 'D' :
+			case 'd' :
+				dbg.setDebug( true );
+				log.log( &quot;debug output enabled&quot; );
+				break;
+			case 'T' :
+			case 't' :
+				dbg.setPrintType( PrintActual );
+				if ( dbg.isDebug() ) {
+					log.log(&quot;Should print actual time!&quot;);
+				}
+				break;
+			case 'R' :
+			case 'r' :
+				dbg.setPrintType( PrintDelta );
+				if ( dbg.isDebug() ) {
+					log.log(&quot;Should print relative time!&quot;);
+				}
+				break;
+			default:
+				if ( dbg.isDebug() ) {
+					log.show( &quot;Unrecognized argument: &quot; );
+					log.log( argVal );
+				}
+				break;
+		}
+	} else {
+		if ( dbg.isDebug() ) {
+			log.show( &quot;Argument value: &quot; );
+			log.log( UMLRTMain::getArg(i) );
+		}
+	}
 }
 </body>
             </effect>
@@ -86,7 +90,7 @@
           <subvertex xmi:type="uml:State" xmi:id="_mtrUsKW-EeWN9JTg-IMukA" name="Running">
             <entry xmi:type="uml:OpaqueBehavior" xmi:id="_YSG7oKXBEeWN9JTg-IMukA" name="topRunning">
               <language>C++</language>
-              <body>log.log(&quot;Top is running.&quot;);
+              <body>log.log( &quot;Top is running. &quot;);
 </body>
             </entry>
           </subvertex>
@@ -97,10 +101,15 @@
       <ownedAttribute xmi:type="uml:Port" xmi:id="_rXDN4JhoEeW6kuh42ZvZkQ" name="log" visibility="protected" isOrdered="true" aggregation="composite" isBehavior="true" isService="false">
         <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QDiL8KgXEeWGg7h3jLnwpQ" name="dbg" visibility="protected" type="_XQSjAKgWEeWGg7h3jLnwpQ"/>
       <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_gGwlYJhoEeW6kuh42ZvZkQ" name="StateMachine" isReentrant="false">
         <region xmi:type="uml:Region" xmi:id="_gGwlYZhoEeW6kuh42ZvZkQ" name="Region">
-          <transition xmi:type="uml:Transition" xmi:id="_gGwlYphoEeW6kuh42ZvZkQ" name="belowOneInitial" source="_gGwlZphoEeW6kuh42ZvZkQ" target="_gGwlZ5hoEeW6kuh42ZvZkQ"/>
+          <transition xmi:type="uml:Transition" xmi:id="_gGwlYphoEeW6kuh42ZvZkQ" name="belowOneInitial" source="_gGwlZphoEeW6kuh42ZvZkQ" target="_gGwlZ5hoEeW6kuh42ZvZkQ">
+            <effect xmi:type="uml:OpaqueBehavior" xmi:id="_qF3HcKmuEeWEXOiRnj2ETQ" name="below1Init">
+              <language>C++</language>
+              <body>log.log( &quot;below1Init&quot; );
+</body>
+            </effect>
+          </transition>
           <subvertex xmi:type="uml:Pseudostate" xmi:id="_gGwlZphoEeW6kuh42ZvZkQ">
             <name xsi:nil="true"/>
           </subvertex>
@@ -108,19 +117,23 @@
             <entry xmi:type="uml:OpaqueBehavior" xmi:id="_gGwlaJhoEeW6kuh42ZvZkQ" name="Running_EN">
               <ownedParameter xmi:type="uml:Parameter" xmi:id="_tHPbUJh3EeW6kuh42ZvZkQ" name="msg"/>
               <language>C++</language>
-              <body>log.show( &quot;In Below1, &quot;);
+              <body>log.log( &quot;Below1 Running&quot;);
 
-if ( DBG::isDebug ) {
+if ( dbg.isDebug() ) {
 	log.log(&quot;Debug is ON!&quot;);
-	if (DBG::printTime) {
-		log.log(&quot;printTime is true&quot;);
-	} else {
-		log.log(&quot;printTime is false&quot;);
-	}
-	if (DBG::printRelTime) {
-		log.log(&quot;printRelTime is true&quot;);
-	} else {
-		log.log(&quot;printRelTime is false&quot;);
+	switch ( dbg.getPrintKind() ) {
+		case PrintActual:
+			log.log( &quot;Printing actual time.&quot; );
+			break;
+		case PrintDelta:
+			log.log( &quot;Printing relative (delta) time.&quot; );
+			break;
+		case PrintNone:
+			log.log( &quot;Time is not printed.&quot; );
+			break;
+		default:
+			log.log( &quot;Could not decipher printing type!&quot; );
+			break;
 	}
 } else {
 	log.log(&quot;Debug is OFF!&quot;);
@@ -131,13 +144,13 @@
       </ownedBehavior>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_XQSjAKgWEeWGg7h3jLnwpQ" name="DBG">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XQSjAagWEeWGg7h3jLnwpQ" name="debugStatus" visibility="protected" isStatic="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_XQSjAagWEeWGg7h3jLnwpQ" name="debugStatus" visibility="protected">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XQSjAqgWEeWGg7h3jLnwpQ" name="printTimeKind" visibility="protected" isStatic="true" type="_XQXbgKgWEeWGg7h3jLnwpQ"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_XQSjAqgWEeWGg7h3jLnwpQ" name="printTimeKind" visibility="protected" type="_XQXbgKgWEeWGg7h3jLnwpQ"/>
       <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_XQSjA6gWEeWGg7h3jLnwpQ" name="isDebug" specification="_XQSjB6gWEeWGg7h3jLnwpQ">
         <language>C++</language>
-        <body>return(debugStatus);
+        <body>return( debugStatus );
 </body>
       </ownedBehavior>
       <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_XQSjBKgWEeWGg7h3jLnwpQ" name="setDebug" specification="_XQSjCagWEeWGg7h3jLnwpQ">
@@ -150,7 +163,7 @@
         <body>printTimeKind = printType;
 </body>
       </ownedBehavior>
-      <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_XQSjBqgWEeWGg7h3jLnwpQ" name="getPrintType" specification="_XQSjDagWEeWGg7h3jLnwpQ">
+      <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_XQSjBqgWEeWGg7h3jLnwpQ" name="getPrintKind" specification="_XQSjDagWEeWGg7h3jLnwpQ">
         <language>C++</language>
         <body>return( printTimeKind );
 </body>
@@ -172,12 +185,14 @@
         <ownedParameter xmi:type="uml:Parameter" xmi:id="_XQSjDqgWEeWGg7h3jLnwpQ" type="_XQXbgKgWEeWGg7h3jLnwpQ" direction="return"/>
       </ownedOperation>
     </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_XQXbgKgWEeWGg7h3jLnwpQ" name="UtilsPrintKinds">
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_XQXbgKgWEeWGg7h3jLnwpQ" name="debugPrintKinds">
       <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XQXbgagWEeWGg7h3jLnwpQ" name="PrintNone"/>
       <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XQXbgqgWEeWGg7h3jLnwpQ" name="PrintActual"/>
       <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XQXbg6gWEeWGg7h3jLnwpQ" name="PrintDelta"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Usage" xmi:id="_XQYCkKgWEeWGg7h3jLnwpQ" client="_XQSjAKgWEeWGg7h3jLnwpQ" supplier="_XQXbgKgWEeWGg7h3jLnwpQ"/>
+    <packagedElement xmi:type="uml:Usage" xmi:id="_HSnasKmdEeWEXOiRnj2ETQ" client="_kailMJhcEeW6kuh42ZvZkQ" supplier="_XQSjAKgWEeWGg7h3jLnwpQ"/>
+    <packagedElement xmi:type="uml:Usage" xmi:id="_KpIqkKmdEeWEXOiRnj2ETQ" client="_WD4yQJhoEeW6kuh42ZvZkQ" supplier="_XQSjAKgWEeWGg7h3jLnwpQ"/>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_NAR6MJhcEeW6kuh42ZvZkQ">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NAWysJhcEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt#/"/>
@@ -191,24 +206,18 @@
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/UMLRealTimeSM-addendum.profile.uml#_KLcn0FDtEeOA4ecmvfqvaw"/>
     </profileApplication>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_KOH0QJhfEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Q5VMKWlEeWQpteN6q2dUA" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VMaWlEeWQpteN6q2dUA" key="Version" value="0.0.11"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VMqWlEeWQpteN6q2dUA" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VM6WlEeWQpteN6q2dUA" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VNKWlEeWQpteN6q2dUA" key="Date" value="2015-12-10"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Q5VNaWlEeWQpteN6q2dUA" key="Author" value=""/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GUss0KmQEeWtZctEI02BYg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GUss0amQEeWtZctEI02BYg" key="Version" value="0.0.11"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GUss0qmQEeWtZctEI02BYg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GUss06mQEeWtZctEI02BYg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GUss1KmQEeWtZctEI02BYg" key="Date" value="2015-12-10"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GUss1amQEeWtZctEI02BYg" key="Author" value=""/>
       </eAnnotations>
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KOIbUJhfEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_xXe8YFiYEeWkUszwrjRJag"/>
+        <references xmi:type="ecore:EPackage" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_u3BoQJ9ZEeWtHskdthI1Bg"/>
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UMLRT_CPP/RTCppProperties.profile.uml#_vl5LALs8EeSTjNEQkASznQ"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4cJgEJhhEeW6kuh42ZvZkQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4cJgEZhhEeW6kuh42ZvZkQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-    </profileApplication>
   </uml:Model>
   <UMLRealTime:Capsule xmi:id="_koBAgJhcEeW6kuh42ZvZkQ" base_Class="_kailMJhcEeW6kuh42ZvZkQ"/>
   <UMLRealTimeStateMach:RTPseudostate xmi:id="_nw5dAJhcEeW6kuh42ZvZkQ" base_Pseudostate="_nw1LkJhcEeW6kuh42ZvZkQ"/>
@@ -224,4 +233,11 @@
   <UMLRealTime:RTPort xmi:id="_rXG4QJhoEeW6kuh42ZvZkQ" isWired="false" base_Port="_rXDN4JhoEeW6kuh42ZvZkQ"/>
   <UMLRealTime:CapsulePart xmi:id="_1lSjgJhoEeW6kuh42ZvZkQ" base_Property="_1lOSEJhoEeW6kuh42ZvZkQ"/>
   <UMLRealTimeStateMach:RTState xmi:id="_mttw8KW-EeWN9JTg-IMukA" base_State="_mtrUsKW-EeWN9JTg-IMukA"/>
+  <RTCppProperties:CapsuleProperties xmi:id="_l5BYwKmcEeWEXOiRnj2ETQ" headerPreface="#include &quot;umlrtmain.hh&quot;" base_Class="_WD4yQJhoEeW6kuh42ZvZkQ"/>
+  <RTCppProperties:DependencyProperties xmi:id="_C96EQKmdEeWEXOiRnj2ETQ" KindInHeader="Inclusion" KindInImplementation="None" base_Dependency="_XQYCkKgWEeWGg7h3jLnwpQ"/>
+  <RTCppProperties:DependencyProperties xmi:id="_I11g8KmdEeWEXOiRnj2ETQ" KindInHeader="Inclusion" KindInImplementation="None" base_Dependency="_HSnasKmdEeWEXOiRnj2ETQ"/>
+  <RTCppProperties:DependencyProperties xmi:id="_MhLKQKmdEeWEXOiRnj2ETQ" KindInHeader="Inclusion" KindInImplementation="None" base_Dependency="_KpIqkKmdEeWEXOiRnj2ETQ"/>
+  <RTCppProperties:AttributeProperties xmi:id="_dTy9cKmeEeWEXOiRnj2ETQ" base_Property="_XQSjAagWEeWGg7h3jLnwpQ"/>
+  <RTCppProperties:AttributeProperties xmi:id="_fHbeQKmeEeWEXOiRnj2ETQ" base_Property="_XQSjAqgWEeWGg7h3jLnwpQ"/>
+  <RTCppProperties:PassiveClassProperties xmi:id="_AwF08Km1EeWEXOiRnj2ETQ" headerEnding="extern DBG dbg;" implementationEnding="DBG dbg;" base_Class="_XQSjAKgWEeWGg7h3jLnwpQ" generateStateMachine="false" generateAssignmentOperator="false" generateCopyConstructor="false"/>
 </xmi:XMI>
diff --git a/models/samples/GetArguments/Read-Me.md b/models/samples/GetArguments/Read-Me.md
index 63931c3..53c2a0c 100644
--- a/models/samples/GetArguments/Read-Me.md
+++ b/models/samples/GetArguments/Read-Me.md
@@ -2,7 +2,7 @@
 
 The GetArguments sample model shows how to read arguments passed to the UML-RT application through the command line on application startup.
 
-The GetArguments sample model uses the approach shown in the ClassUtility sample model to store the information from the command line. Note that the limitations expresses in the documentation for the ClassUtility sample model also apply in this case.
+The GetArguments sample model uses a refined version of the approach shown in the ClassUtility sample model to store the information from the command line. Note that the limitations expresses in the documentation for the ClassUtility sample model also apply in this case.
 
 ## GetArguments Status
 
@@ -10,20 +10,23 @@
 
 ## GetArguments TBD
 
-- Fix compilation errors
-	- TopControllers.cc:47:1: error: cannot convert 'bool' to 'const char*' in initialization
- 	- TopControllers.cc:101:1: error: cannot convert 'bool' to 'const char*' in initialization 
 - Full testing
 - Documentation (above what is shown above)
 
 ## GetArguments History
 
 ### 2015.12.23
-
+- Resolved the compilation errors from yesterday:
+	- _TopControllers.cc:47:1: error: cannot convert 'bool' to 'const char*' in initialization_
+ 	- _TopControllers.cc:101:1: error: cannot convert 'bool' to 'const char*' in initialization_
+- Completed global access to debugging flags 
 - Updated Read-Me.md with TBD (To Be Done) section
 
 ### 2015.12.22
 -  Pushed to Git repository
+- compilation errors present at end of day:
+	- TopControllers.cc:47:1: error: cannot convert 'bool' to 'const char*' in initialization
+	- TopControllers.cc:101:1: error: cannot convert 'bool' to 'const char*' in initialization
 
 ### 2015.12.21
 - Still need to find a way to have a global, static repository for debug status.