diff --git a/resources/AADLv2/aadl_project.aadl b/resources/AADLv2/aadl_project.aadl
index 66e17dbc..31574617 100644
--- a/resources/AADLv2/aadl_project.aadl
+++ b/resources/AADLv2/aadl_project.aadl
@@ -78,7 +78,9 @@ property set AADL_Project is
      Simulink_6_5,
      System_C,
      VHDL,
-     ACN);
+     ACN,
+     QGenC,
+     QGenAda);
 
   Supported_Distributions: type enumeration (Fixed, Poisson);
 
diff --git a/src/backends/ocarina-backends-properties.adb b/src/backends/ocarina-backends-properties.adb
index 5b257376..90ffd9ba 100644
--- a/src/backends/ocarina-backends-properties.adb
+++ b/src/backends/ocarina-backends-properties.adb
@@ -270,6 +270,8 @@ package body Ocarina.Backends.Properties is
    Language_Simulink_Name        : Name_Id;
    Language_System_C_Name        : Name_Id;
    Language_VHDL_Name            : Name_Id;
+   Language_QGenAda_Name         : Name_Id;
+   Language_QGenC_Name           : Name_Id;
 
    Thread_Periodic_Name   : Name_Id;
    Thread_Aperiodic_Name  : Name_Id;
@@ -1203,6 +1205,12 @@ package body Ocarina.Backends.Properties is
       elsif Source_L = Language_LUA_Name then
          return Language_Lua;
 
+      elsif Source_L = Language_QGenAda_Name then
+         return Language_QGenAda;
+
+      elsif Source_L = Language_QGenC_Name then
+         return Language_QGenC;
+
       else
          Display_Located_Error
            (AIN.Loc (E),
@@ -1385,7 +1393,7 @@ package body Ocarina.Backends.Properties is
                return Subprogram_Unknown;
             end if;
 
-         when Language_Simulink =>
+         when Language_Simulink | Language_QGenC | Language_QGenAda =>
             return Subprogram_Simulink;
 
          when Language_Scade =>
@@ -2898,6 +2906,8 @@ package body Ocarina.Backends.Properties is
       Language_SDL_RTDS_Name        := Get_String_Name ("sdl_rtds");
       Language_VHDL_Name            := Get_String_Name ("vhdl");
       Language_System_C_Name        := Get_String_Name ("system_c");
+      Language_QGenAda_Name         := Get_String_Name ("qgenada");
+      Language_QGenC_Name           := Get_String_Name ("qgenc");
 
       Thread_Periodic_Name   := Get_String_Name ("periodic");
       Thread_Aperiodic_Name  := Get_String_Name ("aperiodic");
diff --git a/src/backends/ocarina-backends-properties.ads b/src/backends/ocarina-backends-properties.ads
index 5e5863d0..bc9c23b0 100644
--- a/src/backends/ocarina-backends-properties.ads
+++ b/src/backends/ocarina-backends-properties.ads
@@ -75,6 +75,8 @@ package Ocarina.Backends.Properties is
       Language_Scade,
       Language_SDL,
       Language_Simulink,
+      Language_QGenC,
+      Language_QGenAda,
       Language_System_C,
       Language_VHDL,
       Language_None);
diff --git a/tests/real-annexes-execution/test_real_exec_02.aadl.out b/tests/real-annexes-execution/test_real_exec_02.aadl.out
index f20208df..038b887a 100644
--- a/tests/real-annexes-execution/test_real_exec_02.aadl.out
+++ b/tests/real-annexes-execution/test_real_exec_02.aadl.out
@@ -151,22 +151,22 @@ Evaluating theorem set_declaration_is_passing_through
 
  * Iterate for variable: rma.erc32_node_a_task_1
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3996 end to end flow spec 
+anonymous end to end flow :3998 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_2
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3996 end to end flow spec 
+anonymous end to end flow :3998 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_12
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3997 end to end flow spec 
+anonymous end to end flow :3999 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_22
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3997 end to end flow spec 
+anonymous end to end flow :3999 end to end flow spec 
  => Result: TRUE
 
 theorem set_declaration_is_passing_through is: TRUE
diff --git a/tests/test_tree_p2/test.aadl.out b/tests/test_tree_p2/test.aadl.out
index e1a2bc4f..d2f2e875 100644
--- a/tests/test_tree_p2/test.aadl.out
+++ b/tests/test_tree_p2/test.aadl.out
@@ -358,10 +358,10 @@ Declarations List_Id 7
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
    Enumeration_Context Node_Id 0
- 122 property type declaration aadl_project.aadl:55:03
+ 124 property type declaration aadl_project.aadl:55:03
   Identifier Node_Id 93
   93 identifier aadl_project.aadl:55:03
-   Corresponding_Entity Node_Id 122
+   Corresponding_Entity Node_Id 124
    Display_Name Name_Id "Supported_Source_Languages"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
@@ -498,1431 +498,1441 @@ Declarations List_Id 7
     Display_Name Name_Id "ACN"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
+   122 identifier aadl_project.aadl:82:06
+    Corresponding_Entity Node_Id 94
+    Display_Name Name_Id "QGenC"
+    Scope_Entity Node_Id 0
+    Backend_Node Node_Id 0
+   123 identifier aadl_project.aadl:83:06
+    Corresponding_Entity Node_Id 94
+    Display_Name Name_Id "QGenAda"
+    Scope_Entity Node_Id 0
+    Backend_Node Node_Id 0
    Enumeration_Context Node_Id 0
- 128 property type declaration aadl_project.aadl:83:03
-  Identifier Node_Id 123
-  123 identifier aadl_project.aadl:83:03
-   Corresponding_Entity Node_Id 128
+ 130 property type declaration aadl_project.aadl:85:03
+  Identifier Node_Id 125
+  125 identifier aadl_project.aadl:85:03
+   Corresponding_Entity Node_Id 130
    Display_Name Name_Id "Supported_Distributions"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 124
-  124 enumeration type aadl_project.aadl:83:33
-   Identifiers List_Id 125
-   126 identifier aadl_project.aadl:83:46
-    Corresponding_Entity Node_Id 124
+  Property_Type_Designator Node_Id 126
+  126 enumeration type aadl_project.aadl:85:33
+   Identifiers List_Id 127
+   128 identifier aadl_project.aadl:85:46
+    Corresponding_Entity Node_Id 126
     Display_Name Name_Id "Fixed"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   127 identifier aadl_project.aadl:83:53
-    Corresponding_Entity Node_Id 124
+   129 identifier aadl_project.aadl:85:53
+    Corresponding_Entity Node_Id 126
     Display_Name Name_Id "Poisson"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
    Enumeration_Context Node_Id 0
- 135 property type declaration aadl_project.aadl:85:03
-  Identifier Node_Id 129
-  129 identifier aadl_project.aadl:85:03
-   Corresponding_Entity Node_Id 135
+ 137 property type declaration aadl_project.aadl:87:03
+  Identifier Node_Id 131
+  131 identifier aadl_project.aadl:87:03
+   Corresponding_Entity Node_Id 137
    Display_Name Name_Id "Supported_Classifier_Substitutions"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 130
-  130 enumeration type aadl_project.aadl:85:44
-   Identifiers List_Id 131
-   132 identifier aadl_project.aadl:85:57
-    Corresponding_Entity Node_Id 130
+  Property_Type_Designator Node_Id 132
+  132 enumeration type aadl_project.aadl:87:44
+   Identifiers List_Id 133
+   134 identifier aadl_project.aadl:87:57
+    Corresponding_Entity Node_Id 132
     Display_Name Name_Id "Classifier_Match"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   133 identifier aadl_project.aadl:85:75
-    Corresponding_Entity Node_Id 130
+   135 identifier aadl_project.aadl:87:75
+    Corresponding_Entity Node_Id 132
     Display_Name Name_Id "Type_Extension"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   134 identifier aadl_project.aadl:85:91
-    Corresponding_Entity Node_Id 130
+   136 identifier aadl_project.aadl:87:91
+    Corresponding_Entity Node_Id 132
     Display_Name Name_Id "Signature_Match"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
    Enumeration_Context Node_Id 0
- 146 property type declaration aadl_project.aadl:88:03
-  Identifier Node_Id 136
-  136 identifier aadl_project.aadl:88:03
-   Corresponding_Entity Node_Id 146
+ 148 property type declaration aadl_project.aadl:90:03
+  Identifier Node_Id 138
+  138 identifier aadl_project.aadl:90:03
+   Corresponding_Entity Node_Id 148
    Display_Name Name_Id "Data_Volume"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 137
-  137 integer type aadl_project.aadl:88:21
-   Type_Range Node_Id 143
-   143 number range aadl_project.aadl:88:33
-    Lower_Bound Node_Id 138
-    138 signed aadlnumber aadl_project.aadl:88:33
-     Number_Value Node_Id 139
-     139 literal aadl_project.aadl:88:33
+  Property_Type_Designator Node_Id 139
+  139 integer type aadl_project.aadl:90:21
+   Type_Range Node_Id 145
+   145 number range aadl_project.aadl:90:33
+    Lower_Bound Node_Id 140
+    140 signed aadlnumber aadl_project.aadl:90:33
+     Number_Value Node_Id 141
+     141 literal aadl_project.aadl:90:33
       Value Value_Id 3
-     Unit_Identifier Node_Id 140
-     140 identifier aadl_project.aadl:88:35
-      Corresponding_Entity Node_Id 276
+     Unit_Identifier Node_Id 142
+     142 identifier aadl_project.aadl:90:35
+      Corresponding_Entity Node_Id 278
       Display_Name Name_Id "bitsps"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-    Upper_Bound Node_Id 142
-    142 property term aadl_project.aadl:88:42
-     Identifier Node_Id 141
-     141 identifier aadl_project.aadl:88:45
+    Upper_Bound Node_Id 144
+    144 property term aadl_project.aadl:90:42
+     Identifier Node_Id 143
+     143 identifier aadl_project.aadl:90:45
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Max_Data_Volume"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 154
+     Entity Node_Id 156
      Property_Set_Identifier Node_Id 0
-   Unit_Designator Node_Id 145
-   145 unique property type identifier aadl_project.aadl:89:03
-    Identifier Node_Id 144
-    144 identifier aadl_project.aadl:89:09
+   Unit_Designator Node_Id 147
+   147 unique property type identifier aadl_project.aadl:91:03
+    Identifier Node_Id 146
+    146 identifier aadl_project.aadl:91:09
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Data_Volume_Units"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 294
+    Entity Node_Id 296
     Property_Set_Identifier Node_Id 0
- 154 constant property declaration aadl_project.aadl:91:03
-  Identifier Node_Id 147
-  147 identifier aadl_project.aadl:91:03
-   Corresponding_Entity Node_Id 154
+ 156 constant property declaration aadl_project.aadl:93:03
+  Identifier Node_Id 149
+  149 identifier aadl_project.aadl:93:03
+   Corresponding_Entity Node_Id 156
    Display_Name Name_Id "Max_Data_Volume"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 148
-  148 integer type aadl_project.aadl:91:29
+  Constant_Type Node_Id 150
+  150 integer type aadl_project.aadl:93:29
    Type_Range Node_Id 0
-   Unit_Designator Node_Id 150
-   150 unique property type identifier aadl_project.aadl:91:41
-    Identifier Node_Id 149
-    149 identifier aadl_project.aadl:91:47
+   Unit_Designator Node_Id 152
+   152 unique property type identifier aadl_project.aadl:93:41
+    Identifier Node_Id 151
+    151 identifier aadl_project.aadl:93:47
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Data_Volume_Units"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 294
+    Entity Node_Id 296
     Property_Set_Identifier Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 155
-  155 property value aadl_project.aadl:91:03
+  Constant_Value Node_Id 157
+  157 property value aadl_project.aadl:93:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 151
-   151 signed aadlnumber aadl_project.aadl:91:68
-    Number_Value Node_Id 152
-    152 literal aadl_project.aadl:91:68
+   Single_Value Node_Id 153
+   153 signed aadlnumber aadl_project.aadl:93:68
+    Number_Value Node_Id 154
+    154 literal aadl_project.aadl:93:68
      Value Value_Id 4
-    Unit_Identifier Node_Id 153
-    153 identifier aadl_project.aadl:91:76
-     Corresponding_Entity Node_Id 276
+    Unit_Identifier Node_Id 155
+    155 identifier aadl_project.aadl:93:76
+     Corresponding_Entity Node_Id 278
      Display_Name Name_Id "bitsps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 160 constant property declaration aadl_project.aadl:93:03
-  Identifier Node_Id 156
-  156 identifier aadl_project.aadl:93:03
-   Corresponding_Entity Node_Id 160
+ 162 constant property declaration aadl_project.aadl:95:03
+  Identifier Node_Id 158
+  158 identifier aadl_project.aadl:95:03
+   Corresponding_Entity Node_Id 162
    Display_Name Name_Id "Max_Aadlinteger"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 157
-  157 integer type aadl_project.aadl:93:29
+  Constant_Type Node_Id 159
+  159 integer type aadl_project.aadl:95:29
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 161
-  161 property value aadl_project.aadl:93:03
+  Constant_Value Node_Id 163
+  163 property value aadl_project.aadl:95:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 158
-   158 signed aadlnumber aadl_project.aadl:93:44
-    Number_Value Node_Id 159
-    159 literal aadl_project.aadl:93:44
+   Single_Value Node_Id 160
+   160 signed aadlnumber aadl_project.aadl:95:44
+    Number_Value Node_Id 161
+    161 literal aadl_project.aadl:95:44
      Value Value_Id 5
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 166 constant property declaration aadl_project.aadl:95:03
-  Identifier Node_Id 162
-  162 identifier aadl_project.aadl:95:03
-   Corresponding_Entity Node_Id 166
+ 168 constant property declaration aadl_project.aadl:97:03
+  Identifier Node_Id 164
+  164 identifier aadl_project.aadl:97:03
+   Corresponding_Entity Node_Id 168
    Display_Name Name_Id "Max_Target_Integer"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 163
-  163 integer type aadl_project.aadl:95:32
+  Constant_Type Node_Id 165
+  165 integer type aadl_project.aadl:97:32
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 167
-  167 property value aadl_project.aadl:95:03
+  Constant_Value Node_Id 169
+  169 property value aadl_project.aadl:97:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 164
-   164 signed aadlnumber aadl_project.aadl:95:47
-    Number_Value Node_Id 165
-    165 literal aadl_project.aadl:95:47
+   Single_Value Node_Id 166
+   166 signed aadlnumber aadl_project.aadl:97:47
+    Number_Value Node_Id 167
+    167 literal aadl_project.aadl:97:47
      Value Value_Id 6
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 172 constant property declaration aadl_project.aadl:97:03
-  Identifier Node_Id 168
-  168 identifier aadl_project.aadl:97:03
-   Corresponding_Entity Node_Id 172
+ 174 constant property declaration aadl_project.aadl:99:03
+  Identifier Node_Id 170
+  170 identifier aadl_project.aadl:99:03
+   Corresponding_Entity Node_Id 174
    Display_Name Name_Id "Max_Base_Address"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 169
-  169 integer type aadl_project.aadl:97:30
+  Constant_Type Node_Id 171
+  171 integer type aadl_project.aadl:99:30
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 173
-  173 property value aadl_project.aadl:97:03
+  Constant_Value Node_Id 175
+  175 property value aadl_project.aadl:99:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 170
-   170 signed aadlnumber aadl_project.aadl:97:45
-    Number_Value Node_Id 171
-    171 literal aadl_project.aadl:97:45
+   Single_Value Node_Id 172
+   172 signed aadlnumber aadl_project.aadl:99:45
+    Number_Value Node_Id 173
+    173 literal aadl_project.aadl:99:45
      Value Value_Id 7
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 180 constant property declaration aadl_project.aadl:99:03
-  Identifier Node_Id 174
-  174 identifier aadl_project.aadl:99:03
-   Corresponding_Entity Node_Id 180
+ 182 constant property declaration aadl_project.aadl:101:03
+  Identifier Node_Id 176
+  176 identifier aadl_project.aadl:101:03
+   Corresponding_Entity Node_Id 182
    Display_Name Name_Id "Max_Memory_Size"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 176
-  176 unique property type identifier aadl_project.aadl:99:20
-   Identifier Node_Id 175
-   175 identifier aadl_project.aadl:99:29
-    Corresponding_Entity Node_Id 1446
+  Constant_Type Node_Id 178
+  178 unique property type identifier aadl_project.aadl:101:20
+   Identifier Node_Id 177
+   177 identifier aadl_project.aadl:101:29
+    Corresponding_Entity Node_Id 1448
     Display_Name Name_Id "Size"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   Entity Node_Id 1446
+   Entity Node_Id 1448
    Property_Set_Identifier Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 181
-  181 property value aadl_project.aadl:99:03
+  Constant_Value Node_Id 183
+  183 property value aadl_project.aadl:101:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 177
-   177 signed aadlnumber aadl_project.aadl:99:37
-    Number_Value Node_Id 178
-    178 literal aadl_project.aadl:99:37
+   Single_Value Node_Id 179
+   179 signed aadlnumber aadl_project.aadl:101:37
+    Number_Value Node_Id 180
+    180 literal aadl_project.aadl:101:37
      Value Value_Id 8
-    Unit_Identifier Node_Id 179
-    179 identifier aadl_project.aadl:99:45
-     Corresponding_Entity Node_Id 225
+    Unit_Identifier Node_Id 181
+    181 identifier aadl_project.aadl:101:45
+     Corresponding_Entity Node_Id 227
      Display_Name Name_Id "Bytes"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 186 constant property declaration aadl_project.aadl:101:03
-  Identifier Node_Id 182
-  182 identifier aadl_project.aadl:101:03
-   Corresponding_Entity Node_Id 186
+ 188 constant property declaration aadl_project.aadl:103:03
+  Identifier Node_Id 184
+  184 identifier aadl_project.aadl:103:03
+   Corresponding_Entity Node_Id 188
    Display_Name Name_Id "Max_Queue_Size"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 183
-  183 integer type aadl_project.aadl:101:28
+  Constant_Type Node_Id 185
+  185 integer type aadl_project.aadl:103:28
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 187
-  187 property value aadl_project.aadl:101:03
+  Constant_Value Node_Id 189
+  189 property value aadl_project.aadl:103:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 184
-   184 signed aadlnumber aadl_project.aadl:101:43
-    Number_Value Node_Id 185
-    185 literal aadl_project.aadl:101:43
+   Single_Value Node_Id 186
+   186 signed aadlnumber aadl_project.aadl:103:43
+    Number_Value Node_Id 187
+    187 literal aadl_project.aadl:103:43
      Value Value_Id 9
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 192 constant property declaration aadl_project.aadl:103:03
-  Identifier Node_Id 188
-  188 identifier aadl_project.aadl:103:03
-   Corresponding_Entity Node_Id 192
+ 194 constant property declaration aadl_project.aadl:105:03
+  Identifier Node_Id 190
+  190 identifier aadl_project.aadl:105:03
+   Corresponding_Entity Node_Id 194
    Display_Name Name_Id "Max_Thread_Limit"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 189
-  189 integer type aadl_project.aadl:103:30
+  Constant_Type Node_Id 191
+  191 integer type aadl_project.aadl:105:30
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 193
-  193 property value aadl_project.aadl:103:03
+  Constant_Value Node_Id 195
+  195 property value aadl_project.aadl:105:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 190
-   190 signed aadlnumber aadl_project.aadl:103:45
-    Number_Value Node_Id 191
-    191 literal aadl_project.aadl:103:45
+   Single_Value Node_Id 192
+   192 signed aadlnumber aadl_project.aadl:105:45
+    Number_Value Node_Id 193
+    193 literal aadl_project.aadl:105:45
      Value Value_Id 10
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 200 constant property declaration aadl_project.aadl:105:03
-  Identifier Node_Id 194
-  194 identifier aadl_project.aadl:105:03
-   Corresponding_Entity Node_Id 200
+ 202 constant property declaration aadl_project.aadl:107:03
+  Identifier Node_Id 196
+  196 identifier aadl_project.aadl:107:03
+   Corresponding_Entity Node_Id 202
    Display_Name Name_Id "Max_Time"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 196
-  196 unique property type identifier aadl_project.aadl:105:13
-   Identifier Node_Id 195
-   195 identifier aadl_project.aadl:105:22
-    Corresponding_Entity Node_Id 1863
+  Constant_Type Node_Id 198
+  198 unique property type identifier aadl_project.aadl:107:13
+   Identifier Node_Id 197
+   197 identifier aadl_project.aadl:107:22
+    Corresponding_Entity Node_Id 1865
     Display_Name Name_Id "Time"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   Entity Node_Id 1863
+   Entity Node_Id 1865
    Property_Set_Identifier Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 201
-  201 property value aadl_project.aadl:105:03
+  Constant_Value Node_Id 203
+  203 property value aadl_project.aadl:107:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 197
-   197 signed aadlnumber aadl_project.aadl:105:30
-    Number_Value Node_Id 198
-    198 literal aadl_project.aadl:105:30
+   Single_Value Node_Id 199
+   199 signed aadlnumber aadl_project.aadl:107:30
+    Number_Value Node_Id 200
+    200 literal aadl_project.aadl:107:30
      Value Value_Id 11
-    Unit_Identifier Node_Id 199
-    199 identifier aadl_project.aadl:105:35
-     Corresponding_Entity Node_Id 270
+    Unit_Identifier Node_Id 201
+    201 identifier aadl_project.aadl:107:35
+     Corresponding_Entity Node_Id 272
      Display_Name Name_Id "hr"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 206 constant property declaration aadl_project.aadl:107:03
-  Identifier Node_Id 202
-  202 identifier aadl_project.aadl:107:03
-   Corresponding_Entity Node_Id 206
+ 208 constant property declaration aadl_project.aadl:109:03
+  Identifier Node_Id 204
+  204 identifier aadl_project.aadl:109:03
+   Corresponding_Entity Node_Id 208
    Display_Name Name_Id "Max_Urgency"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 203
-  203 integer type aadl_project.aadl:107:25
+  Constant_Type Node_Id 205
+  205 integer type aadl_project.aadl:109:25
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 207
-  207 property value aadl_project.aadl:107:03
+  Constant_Value Node_Id 209
+  209 property value aadl_project.aadl:109:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 204
-   204 signed aadlnumber aadl_project.aadl:107:40
-    Number_Value Node_Id 205
-    205 literal aadl_project.aadl:107:40
+   Single_Value Node_Id 206
+   206 signed aadlnumber aadl_project.aadl:109:40
+    Number_Value Node_Id 207
+    207 literal aadl_project.aadl:109:40
      Value Value_Id 12
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 212 constant property declaration aadl_project.aadl:109:03
-  Identifier Node_Id 208
-  208 identifier aadl_project.aadl:109:03
-   Corresponding_Entity Node_Id 212
+ 214 constant property declaration aadl_project.aadl:111:03
+  Identifier Node_Id 210
+  210 identifier aadl_project.aadl:111:03
+   Corresponding_Entity Node_Id 214
    Display_Name Name_Id "Max_Byte_Count"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 209
-  209 integer type aadl_project.aadl:109:28
+  Constant_Type Node_Id 211
+  211 integer type aadl_project.aadl:111:28
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 213
-  213 property value aadl_project.aadl:109:03
+  Constant_Value Node_Id 215
+  215 property value aadl_project.aadl:111:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 210
-   210 signed aadlnumber aadl_project.aadl:109:43
-    Number_Value Node_Id 211
-    211 literal aadl_project.aadl:109:43
+   Single_Value Node_Id 212
+   212 signed aadlnumber aadl_project.aadl:111:43
+    Number_Value Node_Id 213
+    213 literal aadl_project.aadl:111:43
      Value Value_Id 13
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 218 constant property declaration aadl_project.aadl:111:03
-  Identifier Node_Id 214
-  214 identifier aadl_project.aadl:111:03
-   Corresponding_Entity Node_Id 218
+ 220 constant property declaration aadl_project.aadl:113:03
+  Identifier Node_Id 216
+  216 identifier aadl_project.aadl:113:03
+   Corresponding_Entity Node_Id 220
    Display_Name Name_Id "Max_Word_Space"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
   Multiplicity Int 0
-  Constant_Type Node_Id 215
-  215 integer type aadl_project.aadl:111:28
+  Constant_Type Node_Id 217
+  217 integer type aadl_project.aadl:113:28
    Type_Range Node_Id 0
    Unit_Designator Node_Id 0
   Unique_Unit_Identifier Node_Id 0
-  Constant_Value Node_Id 219
-  219 property value aadl_project.aadl:111:03
+  Constant_Value Node_Id 221
+  221 property value aadl_project.aadl:113:03
    Value_Container Node_Id 5
-   Single_Value Node_Id 216
-   216 signed aadlnumber aadl_project.aadl:111:43
-    Number_Value Node_Id 217
-    217 literal aadl_project.aadl:111:43
+   Single_Value Node_Id 218
+   218 signed aadlnumber aadl_project.aadl:113:43
+    Number_Value Node_Id 219
+    219 literal aadl_project.aadl:113:43
      Value Value_Id 14
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
- 244 property type declaration aadl_project.aadl:113:03
-  Identifier Node_Id 220
-  220 identifier aadl_project.aadl:113:03
-   Corresponding_Entity Node_Id 244
+ 246 property type declaration aadl_project.aadl:115:03
+  Identifier Node_Id 222
+  222 identifier aadl_project.aadl:115:03
+   Corresponding_Entity Node_Id 246
    Display_Name Name_Id "Size_Units"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 221
-  221 units type aadl_project.aadl:113:20
-   Base_Identifier Node_Id 222
-   222 identifier aadl_project.aadl:114:03
-    Corresponding_Entity Node_Id 221
+  Property_Type_Designator Node_Id 223
+  223 units type aadl_project.aadl:115:20
+   Base_Identifier Node_Id 224
+   224 identifier aadl_project.aadl:116:03
+    Corresponding_Entity Node_Id 223
     Display_Name Name_Id "bits"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   Unit_Definitions List_Id 223
-   224 unit definition aadl_project.aadl:115:03
-    Identifier Node_Id 225
-    225 identifier aadl_project.aadl:115:03
-     Corresponding_Entity Node_Id 224
+   Unit_Definitions List_Id 225
+   226 unit definition aadl_project.aadl:117:03
+    Identifier Node_Id 227
+    227 identifier aadl_project.aadl:117:03
+     Corresponding_Entity Node_Id 226
      Display_Name Name_Id "Bytes"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 226
-    226 identifier aadl_project.aadl:115:12
-     Corresponding_Entity Node_Id 221
+    Unit_Identifier Node_Id 228
+    228 identifier aadl_project.aadl:117:12
+     Corresponding_Entity Node_Id 223
      Display_Name Name_Id "bits"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 227
-    227 literal aadl_project.aadl:115:19
+    Numeric_Literal Node_Id 229
+    229 literal aadl_project.aadl:117:19
      Value Value_Id 15
-   228 unit definition aadl_project.aadl:116:03
-    Identifier Node_Id 229
-    229 identifier aadl_project.aadl:116:03
-     Corresponding_Entity Node_Id 228
+   230 unit definition aadl_project.aadl:118:03
+    Identifier Node_Id 231
+    231 identifier aadl_project.aadl:118:03
+     Corresponding_Entity Node_Id 230
      Display_Name Name_Id "KByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 230
-    230 identifier aadl_project.aadl:116:12
-     Corresponding_Entity Node_Id 221
+    Unit_Identifier Node_Id 232
+    232 identifier aadl_project.aadl:118:12
+     Corresponding_Entity Node_Id 223
      Display_Name Name_Id "Bytes"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 231
-    231 literal aadl_project.aadl:116:20
+    Numeric_Literal Node_Id 233
+    233 literal aadl_project.aadl:118:20
      Value Value_Id 16
-   232 unit definition aadl_project.aadl:117:03
-    Identifier Node_Id 233
-    233 identifier aadl_project.aadl:117:03
-     Corresponding_Entity Node_Id 232
+   234 unit definition aadl_project.aadl:119:03
+    Identifier Node_Id 235
+    235 identifier aadl_project.aadl:119:03
+     Corresponding_Entity Node_Id 234
      Display_Name Name_Id "MByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 234
-    234 identifier aadl_project.aadl:117:12
-     Corresponding_Entity Node_Id 221
+    Unit_Identifier Node_Id 236
+    236 identifier aadl_project.aadl:119:12
+     Corresponding_Entity Node_Id 223
      Display_Name Name_Id "KByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 235
-    235 literal aadl_project.aadl:117:20
+    Numeric_Literal Node_Id 237
+    237 literal aadl_project.aadl:119:20
      Value Value_Id 17
-   236 unit definition aadl_project.aadl:118:03
-    Identifier Node_Id 237
-    237 identifier aadl_project.aadl:118:03
-     Corresponding_Entity Node_Id 236
+   238 unit definition aadl_project.aadl:120:03
+    Identifier Node_Id 239
+    239 identifier aadl_project.aadl:120:03
+     Corresponding_Entity Node_Id 238
      Display_Name Name_Id "GByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 238
-    238 identifier aadl_project.aadl:118:12
-     Corresponding_Entity Node_Id 221
+    Unit_Identifier Node_Id 240
+    240 identifier aadl_project.aadl:120:12
+     Corresponding_Entity Node_Id 223
      Display_Name Name_Id "MByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 239
-    239 literal aadl_project.aadl:118:20
+    Numeric_Literal Node_Id 241
+    241 literal aadl_project.aadl:120:20
      Value Value_Id 18
-   240 unit definition aadl_project.aadl:119:03
-    Identifier Node_Id 241
-    241 identifier aadl_project.aadl:119:03
-     Corresponding_Entity Node_Id 240
+   242 unit definition aadl_project.aadl:121:03
+    Identifier Node_Id 243
+    243 identifier aadl_project.aadl:121:03
+     Corresponding_Entity Node_Id 242
      Display_Name Name_Id "TByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 242
-    242 identifier aadl_project.aadl:119:12
-     Corresponding_Entity Node_Id 221
+    Unit_Identifier Node_Id 244
+    244 identifier aadl_project.aadl:121:12
+     Corresponding_Entity Node_Id 223
      Display_Name Name_Id "GByte"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 243
-    243 literal aadl_project.aadl:119:20
+    Numeric_Literal Node_Id 245
+    245 literal aadl_project.aadl:121:20
      Value Value_Id 19
    Units_Context Node_Id 0
- 273 property type declaration aadl_project.aadl:121:03
-  Identifier Node_Id 245
-  245 identifier aadl_project.aadl:121:03
-   Corresponding_Entity Node_Id 273
+ 275 property type declaration aadl_project.aadl:123:03
+  Identifier Node_Id 247
+  247 identifier aadl_project.aadl:123:03
+   Corresponding_Entity Node_Id 275
    Display_Name Name_Id "Time_Units"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 246
-  246 units type aadl_project.aadl:121:20
-   Base_Identifier Node_Id 247
-   247 identifier aadl_project.aadl:122:03
-    Corresponding_Entity Node_Id 246
+  Property_Type_Designator Node_Id 248
+  248 units type aadl_project.aadl:123:20
+   Base_Identifier Node_Id 249
+   249 identifier aadl_project.aadl:124:03
+    Corresponding_Entity Node_Id 248
     Display_Name Name_Id "ps"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   Unit_Definitions List_Id 248
-   249 unit definition aadl_project.aadl:123:03
-    Identifier Node_Id 250
-    250 identifier aadl_project.aadl:123:03
-     Corresponding_Entity Node_Id 249
+   Unit_Definitions List_Id 250
+   251 unit definition aadl_project.aadl:125:03
+    Identifier Node_Id 252
+    252 identifier aadl_project.aadl:125:03
+     Corresponding_Entity Node_Id 251
      Display_Name Name_Id "ns"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 251
-    251 identifier aadl_project.aadl:123:09
-     Corresponding_Entity Node_Id 246
+    Unit_Identifier Node_Id 253
+    253 identifier aadl_project.aadl:125:09
+     Corresponding_Entity Node_Id 248
      Display_Name Name_Id "ps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 252
-    252 literal aadl_project.aadl:123:14
+    Numeric_Literal Node_Id 254
+    254 literal aadl_project.aadl:125:14
      Value Value_Id 20
-   253 unit definition aadl_project.aadl:124:03
-    Identifier Node_Id 254
-    254 identifier aadl_project.aadl:124:03
-     Corresponding_Entity Node_Id 253
+   255 unit definition aadl_project.aadl:126:03
+    Identifier Node_Id 256
+    256 identifier aadl_project.aadl:126:03
+     Corresponding_Entity Node_Id 255
      Display_Name Name_Id "us"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 255
-    255 identifier aadl_project.aadl:124:09
-     Corresponding_Entity Node_Id 246
+    Unit_Identifier Node_Id 257
+    257 identifier aadl_project.aadl:126:09
+     Corresponding_Entity Node_Id 248
      Display_Name Name_Id "ns"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 256
-    256 literal aadl_project.aadl:124:14
+    Numeric_Literal Node_Id 258
+    258 literal aadl_project.aadl:126:14
      Value Value_Id 21
-   257 unit definition aadl_project.aadl:125:03
-    Identifier Node_Id 258
-    258 identifier aadl_project.aadl:125:03
-     Corresponding_Entity Node_Id 257
+   259 unit definition aadl_project.aadl:127:03
+    Identifier Node_Id 260
+    260 identifier aadl_project.aadl:127:03
+     Corresponding_Entity Node_Id 259
      Display_Name Name_Id "ms"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 259
-    259 identifier aadl_project.aadl:125:09
-     Corresponding_Entity Node_Id 246
+    Unit_Identifier Node_Id 261
+    261 identifier aadl_project.aadl:127:09
+     Corresponding_Entity Node_Id 248
      Display_Name Name_Id "us"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 260
-    260 literal aadl_project.aadl:125:14
+    Numeric_Literal Node_Id 262
+    262 literal aadl_project.aadl:127:14
      Value Value_Id 22
-   261 unit definition aadl_project.aadl:126:03
-    Identifier Node_Id 262
-    262 identifier aadl_project.aadl:126:03
-     Corresponding_Entity Node_Id 261
+   263 unit definition aadl_project.aadl:128:03
+    Identifier Node_Id 264
+    264 identifier aadl_project.aadl:128:03
+     Corresponding_Entity Node_Id 263
      Display_Name Name_Id "sec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 263
-    263 identifier aadl_project.aadl:126:10
-     Corresponding_Entity Node_Id 246
+    Unit_Identifier Node_Id 265
+    265 identifier aadl_project.aadl:128:10
+     Corresponding_Entity Node_Id 248
      Display_Name Name_Id "ms"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 264
-    264 literal aadl_project.aadl:126:15
+    Numeric_Literal Node_Id 266
+    266 literal aadl_project.aadl:128:15
      Value Value_Id 23
-   265 unit definition aadl_project.aadl:127:03
-    Identifier Node_Id 266
-    266 identifier aadl_project.aadl:127:03
-     Corresponding_Entity Node_Id 265
+   267 unit definition aadl_project.aadl:129:03
+    Identifier Node_Id 268
+    268 identifier aadl_project.aadl:129:03
+     Corresponding_Entity Node_Id 267
      Display_Name Name_Id "min"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 267
-    267 identifier aadl_project.aadl:127:10
-     Corresponding_Entity Node_Id 246
+    Unit_Identifier Node_Id 269
+    269 identifier aadl_project.aadl:129:10
+     Corresponding_Entity Node_Id 248
      Display_Name Name_Id "sec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 268
-    268 literal aadl_project.aadl:127:16
+    Numeric_Literal Node_Id 270
+    270 literal aadl_project.aadl:129:16
      Value Value_Id 24
-   269 unit definition aadl_project.aadl:128:03
-    Identifier Node_Id 270
-    270 identifier aadl_project.aadl:128:03
-     Corresponding_Entity Node_Id 269
+   271 unit definition aadl_project.aadl:130:03
+    Identifier Node_Id 272
+    272 identifier aadl_project.aadl:130:03
+     Corresponding_Entity Node_Id 271
      Display_Name Name_Id "hr"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 271
-    271 identifier aadl_project.aadl:128:09
-     Corresponding_Entity Node_Id 246
+    Unit_Identifier Node_Id 273
+    273 identifier aadl_project.aadl:130:09
+     Corresponding_Entity Node_Id 248
      Display_Name Name_Id "min"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 272
-    272 literal aadl_project.aadl:128:15
+    Numeric_Literal Node_Id 274
+    274 literal aadl_project.aadl:130:15
      Value Value_Id 25
    Units_Context Node_Id 0
- 294 property type declaration aadl_project.aadl:130:03
-  Identifier Node_Id 274
-  274 identifier aadl_project.aadl:130:03
-   Corresponding_Entity Node_Id 294
+ 296 property type declaration aadl_project.aadl:132:03
+  Identifier Node_Id 276
+  276 identifier aadl_project.aadl:132:03
+   Corresponding_Entity Node_Id 296
    Display_Name Name_Id "Data_Volume_Units"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 275
-  275 units type aadl_project.aadl:130:27
-   Base_Identifier Node_Id 276
-   276 identifier aadl_project.aadl:131:03
-    Corresponding_Entity Node_Id 275
+  Property_Type_Designator Node_Id 277
+  277 units type aadl_project.aadl:132:27
+   Base_Identifier Node_Id 278
+   278 identifier aadl_project.aadl:133:03
+    Corresponding_Entity Node_Id 277
     Display_Name Name_Id "bitsps"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   Unit_Definitions List_Id 277
-   278 unit definition aadl_project.aadl:132:03
-    Identifier Node_Id 279
-    279 identifier aadl_project.aadl:132:03
-     Corresponding_Entity Node_Id 278
+   Unit_Definitions List_Id 279
+   280 unit definition aadl_project.aadl:134:03
+    Identifier Node_Id 281
+    281 identifier aadl_project.aadl:134:03
+     Corresponding_Entity Node_Id 280
      Display_Name Name_Id "Bytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 280
-    280 identifier aadl_project.aadl:132:14
-     Corresponding_Entity Node_Id 275
+    Unit_Identifier Node_Id 282
+    282 identifier aadl_project.aadl:134:14
+     Corresponding_Entity Node_Id 277
      Display_Name Name_Id "bitsps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 281
-    281 literal aadl_project.aadl:132:23
+    Numeric_Literal Node_Id 283
+    283 literal aadl_project.aadl:134:23
      Value Value_Id 26
-   282 unit definition aadl_project.aadl:133:03
-    Identifier Node_Id 283
-    283 identifier aadl_project.aadl:133:03
-     Corresponding_Entity Node_Id 282
+   284 unit definition aadl_project.aadl:135:03
+    Identifier Node_Id 285
+    285 identifier aadl_project.aadl:135:03
+     Corresponding_Entity Node_Id 284
      Display_Name Name_Id "KBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 284
-    284 identifier aadl_project.aadl:133:15
-     Corresponding_Entity Node_Id 275
+    Unit_Identifier Node_Id 286
+    286 identifier aadl_project.aadl:135:15
+     Corresponding_Entity Node_Id 277
      Display_Name Name_Id "Bytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 285
-    285 literal aadl_project.aadl:133:25
+    Numeric_Literal Node_Id 287
+    287 literal aadl_project.aadl:135:25
      Value Value_Id 27
-   286 unit definition aadl_project.aadl:134:03
-    Identifier Node_Id 287
-    287 identifier aadl_project.aadl:134:03
-     Corresponding_Entity Node_Id 286
+   288 unit definition aadl_project.aadl:136:03
+    Identifier Node_Id 289
+    289 identifier aadl_project.aadl:136:03
+     Corresponding_Entity Node_Id 288
      Display_Name Name_Id "MBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 288
-    288 identifier aadl_project.aadl:134:15
-     Corresponding_Entity Node_Id 275
+    Unit_Identifier Node_Id 290
+    290 identifier aadl_project.aadl:136:15
+     Corresponding_Entity Node_Id 277
      Display_Name Name_Id "KBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 289
-    289 literal aadl_project.aadl:134:26
+    Numeric_Literal Node_Id 291
+    291 literal aadl_project.aadl:136:26
      Value Value_Id 28
-   290 unit definition aadl_project.aadl:135:03
-    Identifier Node_Id 291
-    291 identifier aadl_project.aadl:135:03
-     Corresponding_Entity Node_Id 290
+   292 unit definition aadl_project.aadl:137:03
+    Identifier Node_Id 293
+    293 identifier aadl_project.aadl:137:03
+     Corresponding_Entity Node_Id 292
      Display_Name Name_Id "GBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 292
-    292 identifier aadl_project.aadl:135:15
-     Corresponding_Entity Node_Id 275
+    Unit_Identifier Node_Id 294
+    294 identifier aadl_project.aadl:137:15
+     Corresponding_Entity Node_Id 277
      Display_Name Name_Id "MBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 293
-    293 literal aadl_project.aadl:135:26
+    Numeric_Literal Node_Id 295
+    295 literal aadl_project.aadl:137:26
      Value Value_Id 29
    Units_Context Node_Id 0
- 315 property type declaration aadl_project.aadl:137:03
-  Identifier Node_Id 295
-  295 identifier aadl_project.aadl:137:03
-   Corresponding_Entity Node_Id 315
+ 317 property type declaration aadl_project.aadl:139:03
+  Identifier Node_Id 297
+  297 identifier aadl_project.aadl:139:03
+   Corresponding_Entity Node_Id 317
    Display_Name Name_Id "Data_Rate_Units"
    Scope_Entity Node_Id 6
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 296
-  296 units type aadl_project.aadl:137:27
-   Base_Identifier Node_Id 297
-   297 identifier aadl_project.aadl:137:34
-    Corresponding_Entity Node_Id 296
+  Property_Type_Designator Node_Id 298
+  298 units type aadl_project.aadl:139:27
+   Base_Identifier Node_Id 299
+   299 identifier aadl_project.aadl:139:34
+    Corresponding_Entity Node_Id 298
     Display_Name Name_Id "bitsps"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   Unit_Definitions List_Id 298
-   299 unit definition aadl_project.aadl:137:42
-    Identifier Node_Id 300
-    300 identifier aadl_project.aadl:137:42
-     Corresponding_Entity Node_Id 299
+   Unit_Definitions List_Id 300
+   301 unit definition aadl_project.aadl:139:42
+    Identifier Node_Id 302
+    302 identifier aadl_project.aadl:139:42
+     Corresponding_Entity Node_Id 301
      Display_Name Name_Id "Bytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 301
-    301 identifier aadl_project.aadl:137:53
-     Corresponding_Entity Node_Id 296
+    Unit_Identifier Node_Id 303
+    303 identifier aadl_project.aadl:139:53
+     Corresponding_Entity Node_Id 298
      Display_Name Name_Id "bitsps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 302
-    302 literal aadl_project.aadl:137:62
+    Numeric_Literal Node_Id 304
+    304 literal aadl_project.aadl:139:62
      Value Value_Id 30
-   303 unit definition aadl_project.aadl:137:65
-    Identifier Node_Id 304
-    304 identifier aadl_project.aadl:137:65
-     Corresponding_Entity Node_Id 303
+   305 unit definition aadl_project.aadl:139:65
+    Identifier Node_Id 306
+    306 identifier aadl_project.aadl:139:65
+     Corresponding_Entity Node_Id 305
      Display_Name Name_Id "KBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 305
-    305 identifier aadl_project.aadl:137:77
-     Corresponding_Entity Node_Id 296
+    Unit_Identifier Node_Id 307
+    307 identifier aadl_project.aadl:139:77
+     Corresponding_Entity Node_Id 298
      Display_Name Name_Id "Bytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 306
-    306 literal aadl_project.aadl:137:87
+    Numeric_Literal Node_Id 308
+    308 literal aadl_project.aadl:139:87
      Value Value_Id 31
-   307 unit definition aadl_project.aadl:137:93
-    Identifier Node_Id 308
-    308 identifier aadl_project.aadl:137:93
-     Corresponding_Entity Node_Id 307
+   309 unit definition aadl_project.aadl:139:93
+    Identifier Node_Id 310
+    310 identifier aadl_project.aadl:139:93
+     Corresponding_Entity Node_Id 309
      Display_Name Name_Id "MBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 309
-    309 identifier aadl_project.aadl:137:105
-     Corresponding_Entity Node_Id 296
+    Unit_Identifier Node_Id 311
+    311 identifier aadl_project.aadl:139:105
+     Corresponding_Entity Node_Id 298
      Display_Name Name_Id "KBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 310
-    310 literal aadl_project.aadl:137:116
+    Numeric_Literal Node_Id 312
+    312 literal aadl_project.aadl:139:116
      Value Value_Id 32
-   311 unit definition aadl_project.aadl:137:122
-    Identifier Node_Id 312
-    312 identifier aadl_project.aadl:137:122
-     Corresponding_Entity Node_Id 311
+   313 unit definition aadl_project.aadl:139:122
+    Identifier Node_Id 314
+    314 identifier aadl_project.aadl:139:122
+     Corresponding_Entity Node_Id 313
      Display_Name Name_Id "GBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Unit_Identifier Node_Id 313
-    313 identifier aadl_project.aadl:137:134
-     Corresponding_Entity Node_Id 296
+    Unit_Identifier Node_Id 315
+    315 identifier aadl_project.aadl:139:134
+     Corresponding_Entity Node_Id 298
      Display_Name Name_Id "MBytesps"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Numeric_Literal Node_Id 314
-    314 literal aadl_project.aadl:137:145
+    Numeric_Literal Node_Id 316
+    316 literal aadl_project.aadl:139:145
      Value Value_Id 33
    Units_Context Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-317 property set deployment_properties.aadl:6:01
- Identifier Node_Id 316
- 316 identifier deployment_properties.aadl:6:14
-  Corresponding_Entity Node_Id 317
+319 property set deployment_properties.aadl:6:01
+ Identifier Node_Id 318
+ 318 identifier deployment_properties.aadl:6:14
+  Corresponding_Entity Node_Id 319
   Display_Name Name_Id "Deployment_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 318
- Declarations List_Id 336
- 333 property definition declaration deployment_properties.aadl:7:02
-  Identifier Node_Id 319
-  319 identifier deployment_properties.aadl:7:02
-   Corresponding_Entity Node_Id 333
+ Entity_Scope Node_Id 320
+ Declarations List_Id 338
+ 335 property definition declaration deployment_properties.aadl:7:02
+  Identifier Node_Id 321
+  321 identifier deployment_properties.aadl:7:02
+   Corresponding_Entity Node_Id 335
    Display_Name Name_Id "Allowed_Processor_Binding_Class"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 335
-  335 property type deployment_properties.aadl:7:02
+  Property_Name_Type Node_Id 337
+  337 property type deployment_properties.aadl:7:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 325
-   325 classifier type deployment_properties.aadl:8:19
-    List_Items List_Id 321
-    322 classifier category ref deployment_properties.aadl:8:31
+   Property_Type_Designator Node_Id 327
+   327 classifier type deployment_properties.aadl:8:19
+    List_Items List_Id 323
+    324 classifier category ref deployment_properties.aadl:8:31
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    323 classifier category ref deployment_properties.aadl:8:42
+    325 classifier category ref deployment_properties.aadl:8:42
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    324 classifier category ref deployment_properties.aadl:8:61
+    326 classifier category ref deployment_properties.aadl:8:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 325
-   325 classifier type deployment_properties.aadl:8:19
-    List_Items List_Id 321
-    322 classifier category ref deployment_properties.aadl:8:31
+   Expanded_Type_Designator Node_Id 327
+   327 classifier type deployment_properties.aadl:8:19
+    List_Items List_Id 323
+    324 classifier category ref deployment_properties.aadl:8:31
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    323 classifier category ref deployment_properties.aadl:8:42
+    325 classifier category ref deployment_properties.aadl:8:42
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    324 classifier category ref deployment_properties.aadl:8:61
+    326 classifier category ref deployment_properties.aadl:8:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 334
-  334 applies to deployment_properties.aadl:7:02
+  Applies_To Node_Id 336
+  336 applies to deployment_properties.aadl:7:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 326
-   327 named element deployment_properties.aadl:9:15
+   Owner_Categories List_Id 328
+   329 named element deployment_properties.aadl:9:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   328 named element deployment_properties.aadl:9:23
+   330 named element deployment_properties.aadl:9:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   329 named element deployment_properties.aadl:9:37
+   331 named element deployment_properties.aadl:9:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   330 named element deployment_properties.aadl:9:46
+   332 named element deployment_properties.aadl:9:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   331 named element deployment_properties.aadl:9:54
+   333 named element deployment_properties.aadl:9:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   332 named element deployment_properties.aadl:9:73
+   334 named element deployment_properties.aadl:9:73
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 351 property definition declaration deployment_properties.aadl:11:02
-  Identifier Node_Id 337
-  337 identifier deployment_properties.aadl:11:02
-   Corresponding_Entity Node_Id 351
+ 353 property definition declaration deployment_properties.aadl:11:02
+  Identifier Node_Id 339
+  339 identifier deployment_properties.aadl:11:02
+   Corresponding_Entity Node_Id 353
    Display_Name Name_Id "Allowed_Processor_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 353
-  353 property type deployment_properties.aadl:11:02
+  Property_Name_Type Node_Id 355
+  355 property type deployment_properties.aadl:11:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 343
-   343 reference type deployment_properties.aadl:11:45
-    List_Items List_Id 339
-    340 reference category deployment_properties.aadl:11:56
+   Property_Type_Designator Node_Id 345
+   345 reference type deployment_properties.aadl:11:45
+    List_Items List_Id 341
+    342 reference category deployment_properties.aadl:11:56
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    341 reference category deployment_properties.aadl:11:67
+    343 reference category deployment_properties.aadl:11:67
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    342 reference category deployment_properties.aadl:11:86
+    344 reference category deployment_properties.aadl:11:86
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 343
-   343 reference type deployment_properties.aadl:11:45
-    List_Items List_Id 339
-    340 reference category deployment_properties.aadl:11:56
+   Expanded_Type_Designator Node_Id 345
+   345 reference type deployment_properties.aadl:11:45
+    List_Items List_Id 341
+    342 reference category deployment_properties.aadl:11:56
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    341 reference category deployment_properties.aadl:11:67
+    343 reference category deployment_properties.aadl:11:67
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    342 reference category deployment_properties.aadl:11:86
+    344 reference category deployment_properties.aadl:11:86
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 352
-  352 applies to deployment_properties.aadl:11:02
+  Applies_To Node_Id 354
+  354 applies to deployment_properties.aadl:11:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 344
-   345 named element deployment_properties.aadl:12:15
+   Owner_Categories List_Id 346
+   347 named element deployment_properties.aadl:12:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   346 named element deployment_properties.aadl:12:23
+   348 named element deployment_properties.aadl:12:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   347 named element deployment_properties.aadl:12:37
+   349 named element deployment_properties.aadl:12:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   348 named element deployment_properties.aadl:12:46
+   350 named element deployment_properties.aadl:12:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   349 named element deployment_properties.aadl:12:54
+   351 named element deployment_properties.aadl:12:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   350 named element deployment_properties.aadl:12:73
+   352 named element deployment_properties.aadl:12:73
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 367 property definition declaration deployment_properties.aadl:14:02
-  Identifier Node_Id 354
-  354 identifier deployment_properties.aadl:14:02
-   Corresponding_Entity Node_Id 367
+ 369 property definition declaration deployment_properties.aadl:14:02
+  Identifier Node_Id 356
+  356 identifier deployment_properties.aadl:14:02
+   Corresponding_Entity Node_Id 369
    Display_Name Name_Id "Actual_Processor_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 369
-  369 property type deployment_properties.aadl:14:02
+  Property_Name_Type Node_Id 371
+  371 property type deployment_properties.aadl:14:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 359
-   359 reference type deployment_properties.aadl:14:44
-    List_Items List_Id 356
-    357 reference category deployment_properties.aadl:14:55
+   Property_Type_Designator Node_Id 361
+   361 reference type deployment_properties.aadl:14:44
+    List_Items List_Id 358
+    359 reference category deployment_properties.aadl:14:55
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    358 reference category deployment_properties.aadl:14:66
+    360 reference category deployment_properties.aadl:14:66
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 359
-   359 reference type deployment_properties.aadl:14:44
-    List_Items List_Id 356
-    357 reference category deployment_properties.aadl:14:55
+   Expanded_Type_Designator Node_Id 361
+   361 reference type deployment_properties.aadl:14:44
+    List_Items List_Id 358
+    359 reference category deployment_properties.aadl:14:55
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    358 reference category deployment_properties.aadl:14:66
+    360 reference category deployment_properties.aadl:14:66
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 368
-  368 applies to deployment_properties.aadl:14:02
+  Applies_To Node_Id 370
+  370 applies to deployment_properties.aadl:14:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 360
-   361 named element deployment_properties.aadl:15:15
+   Owner_Categories List_Id 362
+   363 named element deployment_properties.aadl:15:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   362 named element deployment_properties.aadl:15:23
+   364 named element deployment_properties.aadl:15:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   363 named element deployment_properties.aadl:15:37
+   365 named element deployment_properties.aadl:15:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   364 named element deployment_properties.aadl:15:46
+   366 named element deployment_properties.aadl:15:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   365 named element deployment_properties.aadl:15:54
+   367 named element deployment_properties.aadl:15:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   366 named element deployment_properties.aadl:15:73
+   368 named element deployment_properties.aadl:15:73
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 389 property definition declaration deployment_properties.aadl:17:02
-  Identifier Node_Id 370
-  370 identifier deployment_properties.aadl:17:02
-   Corresponding_Entity Node_Id 389
+ 391 property definition declaration deployment_properties.aadl:17:02
+  Identifier Node_Id 372
+  372 identifier deployment_properties.aadl:17:02
+   Corresponding_Entity Node_Id 391
    Display_Name Name_Id "Allowed_Memory_Binding_Class"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 391
-  391 property type deployment_properties.aadl:17:02
+  Property_Name_Type Node_Id 393
+  393 property type deployment_properties.aadl:17:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 376
-   376 classifier type deployment_properties.aadl:18:19
-    List_Items List_Id 372
-    373 classifier category ref deployment_properties.aadl:18:31
+   Property_Type_Designator Node_Id 378
+   378 classifier type deployment_properties.aadl:18:19
+    List_Items List_Id 374
+    375 classifier category ref deployment_properties.aadl:18:31
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    374 classifier category ref deployment_properties.aadl:18:39
+    376 classifier category ref deployment_properties.aadl:18:39
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-    375 classifier category ref deployment_properties.aadl:18:47
+    377 classifier category ref deployment_properties.aadl:18:47
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 376
-   376 classifier type deployment_properties.aadl:18:19
-    List_Items List_Id 372
-    373 classifier category ref deployment_properties.aadl:18:31
+   Expanded_Type_Designator Node_Id 378
+   378 classifier type deployment_properties.aadl:18:19
+    List_Items List_Id 374
+    375 classifier category ref deployment_properties.aadl:18:31
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    374 classifier category ref deployment_properties.aadl:18:39
+    376 classifier category ref deployment_properties.aadl:18:39
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-    375 classifier category ref deployment_properties.aadl:18:47
+    377 classifier category ref deployment_properties.aadl:18:47
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 390
-  390 applies to deployment_properties.aadl:17:02
+  Applies_To Node_Id 392
+  392 applies to deployment_properties.aadl:17:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 377
-   378 named element deployment_properties.aadl:19:15
+   Owner_Categories List_Id 379
+   380 named element deployment_properties.aadl:19:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   379 named element deployment_properties.aadl:19:23
+   381 named element deployment_properties.aadl:19:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   380 named element deployment_properties.aadl:19:37
+   382 named element deployment_properties.aadl:19:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   381 named element deployment_properties.aadl:19:46
+   383 named element deployment_properties.aadl:19:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   382 named element deployment_properties.aadl:19:54
+   384 named element deployment_properties.aadl:19:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   383 named element deployment_properties.aadl:19:62
+   385 named element deployment_properties.aadl:19:62
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   384 named element deployment_properties.aadl:19:68
+   386 named element deployment_properties.aadl:19:68
     Identifier Node_Id 0
     Category Byte 16
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   385 named element deployment_properties.aadl:19:79
+   387 named element deployment_properties.aadl:19:79
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   386 named element deployment_properties.aadl:19:96
+   388 named element deployment_properties.aadl:19:96
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   387 named element deployment_properties.aadl:19:108
+   389 named element deployment_properties.aadl:19:108
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 3
     Classifier_Ref Node_Id 0
-   388 named element deployment_properties.aadl:19:126
+   390 named element deployment_properties.aadl:19:126
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 411 property definition declaration deployment_properties.aadl:21:02
-  Identifier Node_Id 392
-  392 identifier deployment_properties.aadl:21:02
-   Corresponding_Entity Node_Id 411
+ 413 property definition declaration deployment_properties.aadl:21:02
+  Identifier Node_Id 394
+  394 identifier deployment_properties.aadl:21:02
+   Corresponding_Entity Node_Id 413
    Display_Name Name_Id "Allowed_Memory_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 413
-  413 property type deployment_properties.aadl:21:02
+  Property_Name_Type Node_Id 415
+  415 property type deployment_properties.aadl:21:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 398
-   398 reference type deployment_properties.aadl:21:42
-    List_Items List_Id 394
-    395 reference category deployment_properties.aadl:21:53
+   Property_Type_Designator Node_Id 400
+   400 reference type deployment_properties.aadl:21:42
+    List_Items List_Id 396
+    397 reference category deployment_properties.aadl:21:53
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    396 reference category deployment_properties.aadl:21:61
+    398 reference category deployment_properties.aadl:21:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-    397 reference category deployment_properties.aadl:21:69
+    399 reference category deployment_properties.aadl:21:69
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 398
-   398 reference type deployment_properties.aadl:21:42
-    List_Items List_Id 394
-    395 reference category deployment_properties.aadl:21:53
+   Expanded_Type_Designator Node_Id 400
+   400 reference type deployment_properties.aadl:21:42
+    List_Items List_Id 396
+    397 reference category deployment_properties.aadl:21:53
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    396 reference category deployment_properties.aadl:21:61
+    398 reference category deployment_properties.aadl:21:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-    397 reference category deployment_properties.aadl:21:69
+    399 reference category deployment_properties.aadl:21:69
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 412
-  412 applies to deployment_properties.aadl:21:02
+  Applies_To Node_Id 414
+  414 applies to deployment_properties.aadl:21:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 399
-   400 named element deployment_properties.aadl:22:15
+   Owner_Categories List_Id 401
+   402 named element deployment_properties.aadl:22:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   401 named element deployment_properties.aadl:22:23
+   403 named element deployment_properties.aadl:22:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   402 named element deployment_properties.aadl:22:37
+   404 named element deployment_properties.aadl:22:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   403 named element deployment_properties.aadl:22:46
+   405 named element deployment_properties.aadl:22:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   404 named element deployment_properties.aadl:22:54
+   406 named element deployment_properties.aadl:22:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   405 named element deployment_properties.aadl:22:62
+   407 named element deployment_properties.aadl:22:62
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   406 named element deployment_properties.aadl:22:68
+   408 named element deployment_properties.aadl:22:68
     Identifier Node_Id 0
     Category Byte 16
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   407 named element deployment_properties.aadl:22:79
+   409 named element deployment_properties.aadl:22:79
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   408 named element deployment_properties.aadl:22:96
+   410 named element deployment_properties.aadl:22:96
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   409 named element deployment_properties.aadl:22:108
+   411 named element deployment_properties.aadl:22:108
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 3
     Classifier_Ref Node_Id 0
-   410 named element deployment_properties.aadl:22:126
+   412 named element deployment_properties.aadl:22:126
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 431 property definition declaration deployment_properties.aadl:24:02
-  Identifier Node_Id 414
-  414 identifier deployment_properties.aadl:24:02
-   Corresponding_Entity Node_Id 431
+ 433 property definition declaration deployment_properties.aadl:24:02
+  Identifier Node_Id 416
+  416 identifier deployment_properties.aadl:24:02
+   Corresponding_Entity Node_Id 433
    Display_Name Name_Id "Actual_Memory_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 433
-  433 property type deployment_properties.aadl:24:02
+  Property_Name_Type Node_Id 435
+  435 property type deployment_properties.aadl:24:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 418
-   418 reference type deployment_properties.aadl:24:41
-    List_Items List_Id 416
-    417 reference category deployment_properties.aadl:24:52
+   Property_Type_Designator Node_Id 420
+   420 reference type deployment_properties.aadl:24:41
+    List_Items List_Id 418
+    419 reference category deployment_properties.aadl:24:52
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 418
-   418 reference type deployment_properties.aadl:24:41
-    List_Items List_Id 416
-    417 reference category deployment_properties.aadl:24:52
+   Expanded_Type_Designator Node_Id 420
+   420 reference type deployment_properties.aadl:24:41
+    List_Items List_Id 418
+    419 reference category deployment_properties.aadl:24:52
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 432
-  432 applies to deployment_properties.aadl:24:02
+  Applies_To Node_Id 434
+  434 applies to deployment_properties.aadl:24:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 419
-   420 named element deployment_properties.aadl:25:15
+   Owner_Categories List_Id 421
+   422 named element deployment_properties.aadl:25:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   421 named element deployment_properties.aadl:25:23
+   423 named element deployment_properties.aadl:25:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   422 named element deployment_properties.aadl:25:37
+   424 named element deployment_properties.aadl:25:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   423 named element deployment_properties.aadl:25:46
+   425 named element deployment_properties.aadl:25:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   424 named element deployment_properties.aadl:25:54
+   426 named element deployment_properties.aadl:25:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   425 named element deployment_properties.aadl:25:65
+   427 named element deployment_properties.aadl:25:65
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   426 named element deployment_properties.aadl:25:73
+   428 named element deployment_properties.aadl:25:73
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   427 named element deployment_properties.aadl:25:79
+   429 named element deployment_properties.aadl:25:79
     Identifier Node_Id 0
     Category Byte 16
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   428 named element deployment_properties.aadl:25:90
+   430 named element deployment_properties.aadl:25:90
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   429 named element deployment_properties.aadl:25:107
+   431 named element deployment_properties.aadl:25:107
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   430 named element deployment_properties.aadl:25:119
+   432 named element deployment_properties.aadl:25:119
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 3
     Classifier_Ref Node_Id 0
- 454 property definition declaration deployment_properties.aadl:27:02
-  Identifier Node_Id 434
-  434 identifier deployment_properties.aadl:27:02
-   Corresponding_Entity Node_Id 454
+ 456 property definition declaration deployment_properties.aadl:27:02
+  Identifier Node_Id 436
+  436 identifier deployment_properties.aadl:27:02
+   Corresponding_Entity Node_Id 456
    Display_Name Name_Id "Allowed_Connection_Binding_Class"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 456
-  456 property type deployment_properties.aadl:27:02
+  Property_Name_Type Node_Id 458
+  458 property type deployment_properties.aadl:27:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 443
-   443 classifier type deployment_properties.aadl:28:19
-    List_Items List_Id 436
-    437 classifier category ref deployment_properties.aadl:28:31
+   Property_Type_Designator Node_Id 445
+   445 classifier type deployment_properties.aadl:28:19
+    List_Items List_Id 438
+    439 classifier category ref deployment_properties.aadl:28:31
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    438 classifier category ref deployment_properties.aadl:28:42
+    440 classifier category ref deployment_properties.aadl:28:42
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    439 classifier category ref deployment_properties.aadl:28:61
+    441 classifier category ref deployment_properties.aadl:28:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    440 classifier category ref deployment_properties.aadl:28:66
+    442 classifier category ref deployment_properties.aadl:28:66
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-    441 classifier category ref deployment_properties.aadl:28:79
+    443 classifier category ref deployment_properties.aadl:28:79
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    442 classifier category ref deployment_properties.aadl:28:87
+    444 classifier category ref deployment_properties.aadl:28:87
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 443
-   443 classifier type deployment_properties.aadl:28:19
-    List_Items List_Id 436
-    437 classifier category ref deployment_properties.aadl:28:31
+   Expanded_Type_Designator Node_Id 445
+   445 classifier type deployment_properties.aadl:28:19
+    List_Items List_Id 438
+    439 classifier category ref deployment_properties.aadl:28:31
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    438 classifier category ref deployment_properties.aadl:28:42
+    440 classifier category ref deployment_properties.aadl:28:42
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    439 classifier category ref deployment_properties.aadl:28:61
+    441 classifier category ref deployment_properties.aadl:28:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    440 classifier category ref deployment_properties.aadl:28:66
+    442 classifier category ref deployment_properties.aadl:28:66
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-    441 classifier category ref deployment_properties.aadl:28:79
+    443 classifier category ref deployment_properties.aadl:28:79
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    442 classifier category ref deployment_properties.aadl:28:87
+    444 classifier category ref deployment_properties.aadl:28:87
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 455
-  455 applies to deployment_properties.aadl:27:02
+  Applies_To Node_Id 457
+  457 applies to deployment_properties.aadl:27:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 444
-   445 named element deployment_properties.aadl:29:15
+   Owner_Categories List_Id 446
+   447 named element deployment_properties.aadl:29:15
     Identifier Node_Id 0
     Category Byte 31
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   446 named element deployment_properties.aadl:29:24
-    Identifier Node_Id 447
-    447 identifier deployment_properties.aadl:29:24
+   448 named element deployment_properties.aadl:29:24
+    Identifier Node_Id 449
+    449 identifier deployment_properties.aadl:29:24
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -1930,128 +1940,128 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   448 named element deployment_properties.aadl:29:36
+   450 named element deployment_properties.aadl:29:36
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   449 named element deployment_properties.aadl:29:44
+   451 named element deployment_properties.aadl:29:44
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   450 named element deployment_properties.aadl:29:58
+   452 named element deployment_properties.aadl:29:58
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   451 named element deployment_properties.aadl:29:67
+   453 named element deployment_properties.aadl:29:67
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   452 named element deployment_properties.aadl:29:75
+   454 named element deployment_properties.aadl:29:75
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   453 named element deployment_properties.aadl:29:88
+   455 named element deployment_properties.aadl:29:88
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 476 property definition declaration deployment_properties.aadl:31:02
-  Identifier Node_Id 457
-  457 identifier deployment_properties.aadl:31:02
-   Corresponding_Entity Node_Id 476
+ 478 property definition declaration deployment_properties.aadl:31:02
+  Identifier Node_Id 459
+  459 identifier deployment_properties.aadl:31:02
+   Corresponding_Entity Node_Id 478
    Display_Name Name_Id "Allowed_Connection_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 478
-  478 property type deployment_properties.aadl:31:02
+  Property_Name_Type Node_Id 480
+  480 property type deployment_properties.aadl:31:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 466
-   466 reference type deployment_properties.aadl:31:46
-    List_Items List_Id 459
-    460 reference category deployment_properties.aadl:31:57
+   Property_Type_Designator Node_Id 468
+   468 reference type deployment_properties.aadl:31:46
+    List_Items List_Id 461
+    462 reference category deployment_properties.aadl:31:57
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    461 reference category deployment_properties.aadl:31:68
+    463 reference category deployment_properties.aadl:31:68
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    462 reference category deployment_properties.aadl:31:87
+    464 reference category deployment_properties.aadl:31:87
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    463 reference category deployment_properties.aadl:31:92
+    465 reference category deployment_properties.aadl:31:92
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-    464 reference category deployment_properties.aadl:31:105
+    466 reference category deployment_properties.aadl:31:105
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    465 reference category deployment_properties.aadl:31:113
+    467 reference category deployment_properties.aadl:31:113
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 466
-   466 reference type deployment_properties.aadl:31:46
-    List_Items List_Id 459
-    460 reference category deployment_properties.aadl:31:57
+   Expanded_Type_Designator Node_Id 468
+   468 reference type deployment_properties.aadl:31:46
+    List_Items List_Id 461
+    462 reference category deployment_properties.aadl:31:57
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    461 reference category deployment_properties.aadl:31:68
+    463 reference category deployment_properties.aadl:31:68
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    462 reference category deployment_properties.aadl:31:87
+    464 reference category deployment_properties.aadl:31:87
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    463 reference category deployment_properties.aadl:31:92
+    465 reference category deployment_properties.aadl:31:92
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-    464 reference category deployment_properties.aadl:31:105
+    466 reference category deployment_properties.aadl:31:105
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    465 reference category deployment_properties.aadl:31:113
+    467 reference category deployment_properties.aadl:31:113
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 477
-  477 applies to deployment_properties.aadl:31:02
+  Applies_To Node_Id 479
+  479 applies to deployment_properties.aadl:31:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 467
-   468 named element deployment_properties.aadl:32:15
+   Owner_Categories List_Id 469
+   470 named element deployment_properties.aadl:32:15
     Identifier Node_Id 0
     Category Byte 31
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   469 named element deployment_properties.aadl:32:24
-    Identifier Node_Id 470
-    470 identifier deployment_properties.aadl:32:24
+   471 named element deployment_properties.aadl:32:24
+    Identifier Node_Id 472
+    472 identifier deployment_properties.aadl:32:24
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -2059,123 +2069,123 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   471 named element deployment_properties.aadl:32:36
+   473 named element deployment_properties.aadl:32:36
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   472 named element deployment_properties.aadl:32:44
+   474 named element deployment_properties.aadl:32:44
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   473 named element deployment_properties.aadl:32:58
+   475 named element deployment_properties.aadl:32:58
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   474 named element deployment_properties.aadl:32:67
+   476 named element deployment_properties.aadl:32:67
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   475 named element deployment_properties.aadl:32:75
+   477 named element deployment_properties.aadl:32:75
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
- 498 property definition declaration deployment_properties.aadl:34:02
-  Identifier Node_Id 479
-  479 identifier deployment_properties.aadl:34:02
-   Corresponding_Entity Node_Id 498
+ 500 property definition declaration deployment_properties.aadl:34:02
+  Identifier Node_Id 481
+  481 identifier deployment_properties.aadl:34:02
+   Corresponding_Entity Node_Id 500
    Display_Name Name_Id "Actual_Connection_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 500
-  500 property type deployment_properties.aadl:34:02
+  Property_Name_Type Node_Id 502
+  502 property type deployment_properties.aadl:34:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 488
-   488 reference type deployment_properties.aadl:34:45
-    List_Items List_Id 481
-    482 reference category deployment_properties.aadl:34:56
+   Property_Type_Designator Node_Id 490
+   490 reference type deployment_properties.aadl:34:45
+    List_Items List_Id 483
+    484 reference category deployment_properties.aadl:34:56
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    483 reference category deployment_properties.aadl:34:67
+    485 reference category deployment_properties.aadl:34:67
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    484 reference category deployment_properties.aadl:34:86
+    486 reference category deployment_properties.aadl:34:86
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    485 reference category deployment_properties.aadl:34:91
+    487 reference category deployment_properties.aadl:34:91
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-    486 reference category deployment_properties.aadl:34:104
+    488 reference category deployment_properties.aadl:34:104
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    487 reference category deployment_properties.aadl:34:112
+    489 reference category deployment_properties.aadl:34:112
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 488
-   488 reference type deployment_properties.aadl:34:45
-    List_Items List_Id 481
-    482 reference category deployment_properties.aadl:34:56
+   Expanded_Type_Designator Node_Id 490
+   490 reference type deployment_properties.aadl:34:45
+    List_Items List_Id 483
+    484 reference category deployment_properties.aadl:34:56
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    483 reference category deployment_properties.aadl:34:67
+    485 reference category deployment_properties.aadl:34:67
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 9
      Classifier_Ref Node_Id 0
-    484 reference category deployment_properties.aadl:34:86
+    486 reference category deployment_properties.aadl:34:86
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    485 reference category deployment_properties.aadl:34:91
+    487 reference category deployment_properties.aadl:34:91
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-    486 reference category deployment_properties.aadl:34:104
+    488 reference category deployment_properties.aadl:34:104
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    487 reference category deployment_properties.aadl:34:112
+    489 reference category deployment_properties.aadl:34:112
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 499
-  499 applies to deployment_properties.aadl:34:02
+  Applies_To Node_Id 501
+  501 applies to deployment_properties.aadl:34:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 489
-   490 named element deployment_properties.aadl:35:15
+   Owner_Categories List_Id 491
+   492 named element deployment_properties.aadl:35:15
     Identifier Node_Id 0
     Category Byte 31
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   491 named element deployment_properties.aadl:35:24
-    Identifier Node_Id 492
-    492 identifier deployment_properties.aadl:35:24
+   493 named element deployment_properties.aadl:35:24
+    Identifier Node_Id 494
+    494 identifier deployment_properties.aadl:35:24
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -2183,368 +2193,368 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   493 named element deployment_properties.aadl:35:36
+   495 named element deployment_properties.aadl:35:36
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   494 named element deployment_properties.aadl:35:44
+   496 named element deployment_properties.aadl:35:44
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   495 named element deployment_properties.aadl:35:58
+   497 named element deployment_properties.aadl:35:58
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   496 named element deployment_properties.aadl:35:67
+   498 named element deployment_properties.aadl:35:67
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   497 named element deployment_properties.aadl:35:75
+   499 named element deployment_properties.aadl:35:75
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
- 508 property definition declaration deployment_properties.aadl:37:02
-  Identifier Node_Id 501
-  501 identifier deployment_properties.aadl:37:02
-   Corresponding_Entity Node_Id 508
+ 510 property definition declaration deployment_properties.aadl:37:02
+  Identifier Node_Id 503
+  503 identifier deployment_properties.aadl:37:02
+   Corresponding_Entity Node_Id 510
    Display_Name Name_Id "Allowed_Subprogram_Call"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 510
-  510 property type deployment_properties.aadl:37:02
+  Property_Name_Type Node_Id 512
+  512 property type deployment_properties.aadl:37:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 505
-   505 reference type deployment_properties.aadl:37:35
-    List_Items List_Id 503
-    504 reference category deployment_properties.aadl:37:46
+   Property_Type_Designator Node_Id 507
+   507 reference type deployment_properties.aadl:37:35
+    List_Items List_Id 505
+    506 reference category deployment_properties.aadl:37:46
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 505
-   505 reference type deployment_properties.aadl:37:35
-    List_Items List_Id 503
-    504 reference category deployment_properties.aadl:37:46
+   Expanded_Type_Designator Node_Id 507
+   507 reference type deployment_properties.aadl:37:35
+    List_Items List_Id 505
+    506 reference category deployment_properties.aadl:37:46
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 509
-  509 applies to deployment_properties.aadl:37:02
+  Applies_To Node_Id 511
+  511 applies to deployment_properties.aadl:37:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 506
-   507 named element deployment_properties.aadl:38:15
+   Owner_Categories List_Id 508
+   509 named element deployment_properties.aadl:38:15
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 518 property definition declaration deployment_properties.aadl:40:02
-  Identifier Node_Id 511
-  511 identifier deployment_properties.aadl:40:02
-   Corresponding_Entity Node_Id 518
+ 520 property definition declaration deployment_properties.aadl:40:02
+  Identifier Node_Id 513
+  513 identifier deployment_properties.aadl:40:02
+   Corresponding_Entity Node_Id 520
    Display_Name Name_Id "Actual_Subprogram_Call"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 520
-  520 property type deployment_properties.aadl:40:02
+  Property_Name_Type Node_Id 522
+  522 property type deployment_properties.aadl:40:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 514
-   514 reference type deployment_properties.aadl:40:26
-    List_Items List_Id 512
-    513 reference category deployment_properties.aadl:40:37
+   Property_Type_Designator Node_Id 516
+   516 reference type deployment_properties.aadl:40:26
+    List_Items List_Id 514
+    515 reference category deployment_properties.aadl:40:37
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 514
-   514 reference type deployment_properties.aadl:40:26
-    List_Items List_Id 512
-    513 reference category deployment_properties.aadl:40:37
+   Expanded_Type_Designator Node_Id 516
+   516 reference type deployment_properties.aadl:40:26
+    List_Items List_Id 514
+    515 reference category deployment_properties.aadl:40:37
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 519
-  519 applies to deployment_properties.aadl:40:02
+  Applies_To Node_Id 521
+  521 applies to deployment_properties.aadl:40:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 516
-   517 named element deployment_properties.aadl:41:15
+   Owner_Categories List_Id 518
+   519 named element deployment_properties.aadl:41:15
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 534 property definition declaration deployment_properties.aadl:43:02
-  Identifier Node_Id 521
-  521 identifier deployment_properties.aadl:43:02
-   Corresponding_Entity Node_Id 534
+ 536 property definition declaration deployment_properties.aadl:43:02
+  Identifier Node_Id 523
+  523 identifier deployment_properties.aadl:43:02
+   Corresponding_Entity Node_Id 536
    Display_Name Name_Id "Allowed_Subprogram_Call_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 536
-  536 property type deployment_properties.aadl:43:02
+  Property_Name_Type Node_Id 538
+  538 property type deployment_properties.aadl:43:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 527
-   527 reference type deployment_properties.aadl:44:11
-    List_Items List_Id 523
-    524 reference category deployment_properties.aadl:44:22
+   Property_Type_Designator Node_Id 529
+   529 reference type deployment_properties.aadl:44:11
+    List_Items List_Id 525
+    526 reference category deployment_properties.aadl:44:22
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    525 reference category deployment_properties.aadl:44:27
+    527 reference category deployment_properties.aadl:44:27
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    526 reference category deployment_properties.aadl:44:38
+    528 reference category deployment_properties.aadl:44:38
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 527
-   527 reference type deployment_properties.aadl:44:11
-    List_Items List_Id 523
-    524 reference category deployment_properties.aadl:44:22
+   Expanded_Type_Designator Node_Id 529
+   529 reference type deployment_properties.aadl:44:11
+    List_Items List_Id 525
+    526 reference category deployment_properties.aadl:44:22
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    525 reference category deployment_properties.aadl:44:27
+    527 reference category deployment_properties.aadl:44:27
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    526 reference category deployment_properties.aadl:44:38
+    528 reference category deployment_properties.aadl:44:38
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 535
-  535 applies to deployment_properties.aadl:43:02
+  Applies_To Node_Id 537
+  537 applies to deployment_properties.aadl:43:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 528
-   529 named element deployment_properties.aadl:45:15
+   Owner_Categories List_Id 530
+   531 named element deployment_properties.aadl:45:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   530 named element deployment_properties.aadl:45:27
+   532 named element deployment_properties.aadl:45:27
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   531 named element deployment_properties.aadl:45:35
+   533 named element deployment_properties.aadl:45:35
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   532 named element deployment_properties.aadl:45:49
+   534 named element deployment_properties.aadl:45:49
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   533 named element deployment_properties.aadl:45:58
+   535 named element deployment_properties.aadl:45:58
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 547 property definition declaration deployment_properties.aadl:47:02
-  Identifier Node_Id 537
-  537 identifier deployment_properties.aadl:47:02
-   Corresponding_Entity Node_Id 547
+ 549 property definition declaration deployment_properties.aadl:47:02
+  Identifier Node_Id 539
+  539 identifier deployment_properties.aadl:47:02
+   Corresponding_Entity Node_Id 549
    Display_Name Name_Id "Actual_Subprogram_Call_Binding"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 549
-  549 property type deployment_properties.aadl:47:02
+  Property_Name_Type Node_Id 551
+  551 property type deployment_properties.aadl:47:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 544
-   544 reference type deployment_properties.aadl:47:42
-    List_Items List_Id 539
-    540 reference category deployment_properties.aadl:47:53
+   Property_Type_Designator Node_Id 546
+   546 reference type deployment_properties.aadl:47:42
+    List_Items List_Id 541
+    542 reference category deployment_properties.aadl:47:53
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    541 reference category deployment_properties.aadl:47:58
+    543 reference category deployment_properties.aadl:47:58
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    542 reference category deployment_properties.aadl:47:69
+    544 reference category deployment_properties.aadl:47:69
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    543 reference category deployment_properties.aadl:47:77
+    545 reference category deployment_properties.aadl:47:77
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 544
-   544 reference type deployment_properties.aadl:47:42
-    List_Items List_Id 539
-    540 reference category deployment_properties.aadl:47:53
+   Expanded_Type_Designator Node_Id 546
+   546 reference type deployment_properties.aadl:47:42
+    List_Items List_Id 541
+    542 reference category deployment_properties.aadl:47:53
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-    541 reference category deployment_properties.aadl:47:58
+    543 reference category deployment_properties.aadl:47:58
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    542 reference category deployment_properties.aadl:47:69
+    544 reference category deployment_properties.aadl:47:69
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    543 reference category deployment_properties.aadl:47:77
+    545 reference category deployment_properties.aadl:47:77
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 548
-  548 applies to deployment_properties.aadl:47:02
+  Applies_To Node_Id 550
+  550 applies to deployment_properties.aadl:47:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 545
-   546 named element deployment_properties.aadl:48:15
+   Owner_Categories List_Id 547
+   548 named element deployment_properties.aadl:48:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 563 property definition declaration deployment_properties.aadl:50:02
-  Identifier Node_Id 550
-  550 identifier deployment_properties.aadl:50:02
-   Corresponding_Entity Node_Id 563
+ 565 property definition declaration deployment_properties.aadl:50:02
+  Identifier Node_Id 552
+  552 identifier deployment_properties.aadl:50:02
+   Corresponding_Entity Node_Id 565
    Display_Name Name_Id "Provided_Virtual_Bus_Class"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 565
-  565 property type deployment_properties.aadl:50:02
+  Property_Name_Type Node_Id 567
+  567 property type deployment_properties.aadl:50:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 554
-   554 classifier type deployment_properties.aadl:50:46
-    List_Items List_Id 552
-    553 classifier category ref deployment_properties.aadl:50:58
+   Property_Type_Designator Node_Id 556
+   556 classifier type deployment_properties.aadl:50:46
+    List_Items List_Id 554
+    555 classifier category ref deployment_properties.aadl:50:58
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 554
-   554 classifier type deployment_properties.aadl:50:46
-    List_Items List_Id 552
-    553 classifier category ref deployment_properties.aadl:50:58
+   Expanded_Type_Designator Node_Id 556
+   556 classifier type deployment_properties.aadl:50:46
+    List_Items List_Id 554
+    555 classifier category ref deployment_properties.aadl:50:58
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 564
-  564 applies to deployment_properties.aadl:50:02
+  Applies_To Node_Id 566
+  566 applies to deployment_properties.aadl:50:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 555
-   556 named element deployment_properties.aadl:51:15
+   Owner_Categories List_Id 557
+   558 named element deployment_properties.aadl:51:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   557 named element deployment_properties.aadl:51:20
+   559 named element deployment_properties.aadl:51:20
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   558 named element deployment_properties.aadl:51:33
+   560 named element deployment_properties.aadl:51:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   559 named element deployment_properties.aadl:51:44
+   561 named element deployment_properties.aadl:51:44
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   560 named element deployment_properties.aadl:51:63
+   562 named element deployment_properties.aadl:51:63
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   561 named element deployment_properties.aadl:51:71
+   563 named element deployment_properties.aadl:51:71
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   562 named element deployment_properties.aadl:51:79
+   564 named element deployment_properties.aadl:51:79
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 581 property definition declaration deployment_properties.aadl:53:02
-  Identifier Node_Id 566
-  566 identifier deployment_properties.aadl:53:02
-   Corresponding_Entity Node_Id 581
+ 583 property definition declaration deployment_properties.aadl:53:02
+  Identifier Node_Id 568
+  568 identifier deployment_properties.aadl:53:02
+   Corresponding_Entity Node_Id 583
    Display_Name Name_Id "Required_Virtual_Bus_Class"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 583
-  583 property type deployment_properties.aadl:53:02
+  Property_Name_Type Node_Id 585
+  585 property type deployment_properties.aadl:53:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 570
-   570 classifier type deployment_properties.aadl:53:46
-    List_Items List_Id 568
-    569 classifier category ref deployment_properties.aadl:53:58
+   Property_Type_Designator Node_Id 572
+   572 classifier type deployment_properties.aadl:53:46
+    List_Items List_Id 570
+    571 classifier category ref deployment_properties.aadl:53:58
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 570
-   570 classifier type deployment_properties.aadl:53:46
-    List_Items List_Id 568
-    569 classifier category ref deployment_properties.aadl:53:58
+   Expanded_Type_Designator Node_Id 572
+   572 classifier type deployment_properties.aadl:53:46
+    List_Items List_Id 570
+    571 classifier category ref deployment_properties.aadl:53:58
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 11
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 582
-  582 applies to deployment_properties.aadl:53:02
+  Applies_To Node_Id 584
+  584 applies to deployment_properties.aadl:53:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 571
-   572 named element deployment_properties.aadl:54:15
+   Owner_Categories List_Id 573
+   574 named element deployment_properties.aadl:54:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   573 named element deployment_properties.aadl:54:28
-    Identifier Node_Id 574
-    574 identifier deployment_properties.aadl:54:28
+   575 named element deployment_properties.aadl:54:28
+    Identifier Node_Id 576
+    576 identifier deployment_properties.aadl:54:28
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -2552,53 +2562,53 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   575 named element deployment_properties.aadl:54:40
+   577 named element deployment_properties.aadl:54:40
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   576 named element deployment_properties.aadl:54:46
+   578 named element deployment_properties.aadl:54:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   577 named element deployment_properties.aadl:54:54
+   579 named element deployment_properties.aadl:54:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   578 named element deployment_properties.aadl:54:68
+   580 named element deployment_properties.aadl:54:68
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   579 named element deployment_properties.aadl:54:77
+   581 named element deployment_properties.aadl:54:77
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   580 named element deployment_properties.aadl:54:85
+   582 named element deployment_properties.aadl:54:85
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 596 property definition declaration deployment_properties.aadl:56:02
-  Identifier Node_Id 584
-  584 identifier deployment_properties.aadl:56:02
-   Corresponding_Entity Node_Id 596
+ 598 property definition declaration deployment_properties.aadl:56:02
+  Identifier Node_Id 586
+  586 identifier deployment_properties.aadl:56:02
+   Corresponding_Entity Node_Id 598
    Display_Name Name_Id "Provided_Connection_Quality_Of_Service"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 598
-  598 property type deployment_properties.aadl:56:02
+  Property_Name_Type Node_Id 600
+  600 property type deployment_properties.aadl:56:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 587
-   587 unique property type identifier deployment_properties.aadl:56:55
-    Identifier Node_Id 586
-    586 identifier deployment_properties.aadl:56:58
+   Property_Type_Designator Node_Id 589
+   589 unique property type identifier deployment_properties.aadl:56:55
+    Identifier Node_Id 588
+    588 identifier deployment_properties.aadl:56:58
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Connection_QoS"
      Scope_Entity Node_Id 0
@@ -2625,62 +2635,62 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 597
-  597 applies to deployment_properties.aadl:56:02
+  Applies_To Node_Id 599
+  599 applies to deployment_properties.aadl:56:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 588
-   589 named element deployment_properties.aadl:57:15
+   Owner_Categories List_Id 590
+   591 named element deployment_properties.aadl:57:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   590 named element deployment_properties.aadl:57:20
+   592 named element deployment_properties.aadl:57:20
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   591 named element deployment_properties.aadl:57:33
+   593 named element deployment_properties.aadl:57:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   592 named element deployment_properties.aadl:57:44
+   594 named element deployment_properties.aadl:57:44
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   593 named element deployment_properties.aadl:57:63
+   595 named element deployment_properties.aadl:57:63
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   594 named element deployment_properties.aadl:57:71
+   596 named element deployment_properties.aadl:57:71
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   595 named element deployment_properties.aadl:57:79
+   597 named element deployment_properties.aadl:57:79
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 613 property definition declaration deployment_properties.aadl:59:02
-  Identifier Node_Id 599
-  599 identifier deployment_properties.aadl:59:02
-   Corresponding_Entity Node_Id 613
+ 615 property definition declaration deployment_properties.aadl:59:02
+  Identifier Node_Id 601
+  601 identifier deployment_properties.aadl:59:02
+   Corresponding_Entity Node_Id 615
    Display_Name Name_Id "Required_Connection_Quality_Of_Service"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 615
-  615 property type deployment_properties.aadl:59:02
+  Property_Name_Type Node_Id 617
+  617 property type deployment_properties.aadl:59:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 602
-   602 unique property type identifier deployment_properties.aadl:59:55
-    Identifier Node_Id 601
-    601 identifier deployment_properties.aadl:59:58
+   Property_Type_Designator Node_Id 604
+   604 unique property type identifier deployment_properties.aadl:59:55
+    Identifier Node_Id 603
+    603 identifier deployment_properties.aadl:59:58
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Connection_QoS"
      Scope_Entity Node_Id 0
@@ -2707,18 +2717,18 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 614
-  614 applies to deployment_properties.aadl:59:02
+  Applies_To Node_Id 616
+  616 applies to deployment_properties.aadl:59:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 603
-   604 named element deployment_properties.aadl:60:15
+   Owner_Categories List_Id 605
+   606 named element deployment_properties.aadl:60:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   605 named element deployment_properties.aadl:60:21
-    Identifier Node_Id 606
-    606 identifier deployment_properties.aadl:60:21
+   607 named element deployment_properties.aadl:60:21
+    Identifier Node_Id 608
+    608 identifier deployment_properties.aadl:60:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -2726,86 +2736,86 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   607 named element deployment_properties.aadl:60:33
+   609 named element deployment_properties.aadl:60:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   608 named element deployment_properties.aadl:60:46
+   610 named element deployment_properties.aadl:60:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   609 named element deployment_properties.aadl:60:54
+   611 named element deployment_properties.aadl:60:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   610 named element deployment_properties.aadl:60:68
+   612 named element deployment_properties.aadl:60:68
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   611 named element deployment_properties.aadl:60:77
+   613 named element deployment_properties.aadl:60:77
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   612 named element deployment_properties.aadl:60:85
+   614 named element deployment_properties.aadl:60:85
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 641 property definition declaration deployment_properties.aadl:62:02
-  Identifier Node_Id 616
-  616 identifier deployment_properties.aadl:62:02
-   Corresponding_Entity Node_Id 641
+ 643 property definition declaration deployment_properties.aadl:62:02
+  Identifier Node_Id 618
+  618 identifier deployment_properties.aadl:62:02
+   Corresponding_Entity Node_Id 643
    Display_Name Name_Id "Not_Collocated"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 643
-  643 property type deployment_properties.aadl:62:02
+  Property_Name_Type Node_Id 645
+  645 property type deployment_properties.aadl:62:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 636
-   636 record type deployment_properties.aadl:62:25
-    List_Items List_Id 617
-    618 record type element deployment_properties.aadl:63:09
-     Identifier Node_Id 619
-     619 identifier deployment_properties.aadl:63:09
-      Corresponding_Entity Node_Id 618
+   Property_Type_Designator Node_Id 638
+   638 record type deployment_properties.aadl:62:25
+    List_Items List_Id 619
+    620 record type element deployment_properties.aadl:63:09
+     Identifier Node_Id 621
+     621 identifier deployment_properties.aadl:63:09
+      Corresponding_Entity Node_Id 620
       Display_Name Name_Id "Targets"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean TRUE
-     Property_Type_Designator Node_Id 627
-     627 reference type deployment_properties.aadl:63:26
-      List_Items List_Id 620
-      621 reference category deployment_properties.aadl:63:37
+     Property_Type_Designator Node_Id 629
+     629 reference type deployment_properties.aadl:63:26
+      List_Items List_Id 622
+      623 reference category deployment_properties.aadl:63:37
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 1
        Classifier_Ref Node_Id 0
-      622 reference category deployment_properties.aadl:63:43
+      624 reference category deployment_properties.aadl:63:43
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 4
        Classifier_Ref Node_Id 0
-      623 reference category deployment_properties.aadl:63:51
+      625 reference category deployment_properties.aadl:63:51
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 6
        Classifier_Ref Node_Id 0
-      624 reference category deployment_properties.aadl:63:60
+      626 reference category deployment_properties.aadl:63:60
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
-      625 reference category deployment_properties.aadl:63:68
-       Identifier Node_Id 626
-       626 identifier deployment_properties.aadl:63:68
+      627 reference category deployment_properties.aadl:63:68
+       Identifier Node_Id 628
+       628 identifier deployment_properties.aadl:63:68
         Corresponding_Entity Node_Id 0
         Display_Name Name_Id "connection"
         Scope_Entity Node_Id 0
@@ -2813,74 +2823,74 @@ Declarations List_Id 7
        Category Byte 37
        Component_Cat Byte 14
        Classifier_Ref Node_Id 0
-    628 record type element deployment_properties.aadl:64:09
-     Identifier Node_Id 629
-     629 identifier deployment_properties.aadl:64:09
-      Corresponding_Entity Node_Id 628
+    630 record type element deployment_properties.aadl:64:09
+     Identifier Node_Id 631
+     631 identifier deployment_properties.aadl:64:09
+      Corresponding_Entity Node_Id 630
       Display_Name Name_Id "Location"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 635
-     635 classifier type deployment_properties.aadl:64:19
-      List_Items List_Id 630
-      631 classifier category ref deployment_properties.aadl:64:31
+     Property_Type_Designator Node_Id 637
+     637 classifier type deployment_properties.aadl:64:19
+      List_Items List_Id 632
+      633 classifier category ref deployment_properties.aadl:64:31
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 8
        Classifier_Ref Node_Id 0
-      632 classifier category ref deployment_properties.aadl:64:42
+      634 classifier category ref deployment_properties.aadl:64:42
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 7
        Classifier_Ref Node_Id 0
-      633 classifier category ref deployment_properties.aadl:64:50
+      635 classifier category ref deployment_properties.aadl:64:50
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 10
        Classifier_Ref Node_Id 0
-      634 classifier category ref deployment_properties.aadl:64:55
+      636 classifier category ref deployment_properties.aadl:64:55
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 636
-   636 record type deployment_properties.aadl:62:25
-    List_Items List_Id 617
-    618 record type element deployment_properties.aadl:63:09
-     Identifier Node_Id 619
-     619 identifier deployment_properties.aadl:63:09
-      Corresponding_Entity Node_Id 618
+   Expanded_Type_Designator Node_Id 638
+   638 record type deployment_properties.aadl:62:25
+    List_Items List_Id 619
+    620 record type element deployment_properties.aadl:63:09
+     Identifier Node_Id 621
+     621 identifier deployment_properties.aadl:63:09
+      Corresponding_Entity Node_Id 620
       Display_Name Name_Id "Targets"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean TRUE
-     Property_Type_Designator Node_Id 627
-     627 reference type deployment_properties.aadl:63:26
-      List_Items List_Id 620
-      621 reference category deployment_properties.aadl:63:37
+     Property_Type_Designator Node_Id 629
+     629 reference type deployment_properties.aadl:63:26
+      List_Items List_Id 622
+      623 reference category deployment_properties.aadl:63:37
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 1
        Classifier_Ref Node_Id 0
-      622 reference category deployment_properties.aadl:63:43
+      624 reference category deployment_properties.aadl:63:43
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 4
        Classifier_Ref Node_Id 0
-      623 reference category deployment_properties.aadl:63:51
+      625 reference category deployment_properties.aadl:63:51
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 6
        Classifier_Ref Node_Id 0
-      624 reference category deployment_properties.aadl:63:60
+      626 reference category deployment_properties.aadl:63:60
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
-      625 reference category deployment_properties.aadl:63:68
-       Identifier Node_Id 626
-       626 identifier deployment_properties.aadl:63:68
+      627 reference category deployment_properties.aadl:63:68
+       Identifier Node_Id 628
+       628 identifier deployment_properties.aadl:63:68
         Corresponding_Entity Node_Id 0
         Display_Name Name_Id "connection"
         Scope_Entity Node_Id 0
@@ -2888,102 +2898,102 @@ Declarations List_Id 7
        Category Byte 37
        Component_Cat Byte 14
        Classifier_Ref Node_Id 0
-    628 record type element deployment_properties.aadl:64:09
-     Identifier Node_Id 629
-     629 identifier deployment_properties.aadl:64:09
-      Corresponding_Entity Node_Id 628
+    630 record type element deployment_properties.aadl:64:09
+     Identifier Node_Id 631
+     631 identifier deployment_properties.aadl:64:09
+      Corresponding_Entity Node_Id 630
       Display_Name Name_Id "Location"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 635
-     635 classifier type deployment_properties.aadl:64:19
-      List_Items List_Id 630
-      631 classifier category ref deployment_properties.aadl:64:31
+     Property_Type_Designator Node_Id 637
+     637 classifier type deployment_properties.aadl:64:19
+      List_Items List_Id 632
+      633 classifier category ref deployment_properties.aadl:64:31
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 8
        Classifier_Ref Node_Id 0
-      632 classifier category ref deployment_properties.aadl:64:42
+      634 classifier category ref deployment_properties.aadl:64:42
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 7
        Classifier_Ref Node_Id 0
-      633 classifier category ref deployment_properties.aadl:64:50
+      635 classifier category ref deployment_properties.aadl:64:50
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 10
        Classifier_Ref Node_Id 0
-      634 classifier category ref deployment_properties.aadl:64:55
+      636 classifier category ref deployment_properties.aadl:64:55
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 642
-  642 applies to deployment_properties.aadl:62:02
+  Applies_To Node_Id 644
+  644 applies to deployment_properties.aadl:62:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 638
-   639 named element deployment_properties.aadl:65:07
+   Owner_Categories List_Id 640
+   641 named element deployment_properties.aadl:65:07
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   640 named element deployment_properties.aadl:65:16
+   642 named element deployment_properties.aadl:65:16
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 669 property definition declaration deployment_properties.aadl:67:02
-  Identifier Node_Id 644
-  644 identifier deployment_properties.aadl:67:02
-   Corresponding_Entity Node_Id 669
+ 671 property definition declaration deployment_properties.aadl:67:02
+  Identifier Node_Id 646
+  646 identifier deployment_properties.aadl:67:02
+   Corresponding_Entity Node_Id 671
    Display_Name Name_Id "Collocated"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 671
-  671 property type deployment_properties.aadl:67:02
+  Property_Name_Type Node_Id 673
+  673 property type deployment_properties.aadl:67:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 664
-   664 record type deployment_properties.aadl:67:21
-    List_Items List_Id 645
-    646 record type element deployment_properties.aadl:67:23
-     Identifier Node_Id 647
-     647 identifier deployment_properties.aadl:67:23
-      Corresponding_Entity Node_Id 646
+   Property_Type_Designator Node_Id 666
+   666 record type deployment_properties.aadl:67:21
+    List_Items List_Id 647
+    648 record type element deployment_properties.aadl:67:23
+     Identifier Node_Id 649
+     649 identifier deployment_properties.aadl:67:23
+      Corresponding_Entity Node_Id 648
       Display_Name Name_Id "Targets"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean TRUE
-     Property_Type_Designator Node_Id 655
-     655 reference type deployment_properties.aadl:67:40
-      List_Items List_Id 648
-      649 reference category deployment_properties.aadl:67:51
+     Property_Type_Designator Node_Id 657
+     657 reference type deployment_properties.aadl:67:40
+      List_Items List_Id 650
+      651 reference category deployment_properties.aadl:67:51
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 1
        Classifier_Ref Node_Id 0
-      650 reference category deployment_properties.aadl:67:57
+      652 reference category deployment_properties.aadl:67:57
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 4
        Classifier_Ref Node_Id 0
-      651 reference category deployment_properties.aadl:68:03
+      653 reference category deployment_properties.aadl:68:03
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 6
        Classifier_Ref Node_Id 0
-      652 reference category deployment_properties.aadl:68:12
+      654 reference category deployment_properties.aadl:68:12
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
-      653 reference category deployment_properties.aadl:68:20
-       Identifier Node_Id 654
-       654 identifier deployment_properties.aadl:68:20
+      655 reference category deployment_properties.aadl:68:20
+       Identifier Node_Id 656
+       656 identifier deployment_properties.aadl:68:20
         Corresponding_Entity Node_Id 0
         Display_Name Name_Id "connection"
         Scope_Entity Node_Id 0
@@ -2991,74 +3001,74 @@ Declarations List_Id 7
        Category Byte 37
        Component_Cat Byte 14
        Classifier_Ref Node_Id 0
-    656 record type element deployment_properties.aadl:68:33
-     Identifier Node_Id 657
-     657 identifier deployment_properties.aadl:68:33
-      Corresponding_Entity Node_Id 656
+    658 record type element deployment_properties.aadl:68:33
+     Identifier Node_Id 659
+     659 identifier deployment_properties.aadl:68:33
+      Corresponding_Entity Node_Id 658
       Display_Name Name_Id "Location"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 663
-     663 classifier type deployment_properties.aadl:68:43
-      List_Items List_Id 658
-      659 classifier category ref deployment_properties.aadl:69:04
+     Property_Type_Designator Node_Id 665
+     665 classifier type deployment_properties.aadl:68:43
+      List_Items List_Id 660
+      661 classifier category ref deployment_properties.aadl:69:04
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 8
        Classifier_Ref Node_Id 0
-      660 classifier category ref deployment_properties.aadl:69:15
+      662 classifier category ref deployment_properties.aadl:69:15
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 7
        Classifier_Ref Node_Id 0
-      661 classifier category ref deployment_properties.aadl:69:23
+      663 classifier category ref deployment_properties.aadl:69:23
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 10
        Classifier_Ref Node_Id 0
-      662 classifier category ref deployment_properties.aadl:69:28
+      664 classifier category ref deployment_properties.aadl:69:28
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 664
-   664 record type deployment_properties.aadl:67:21
-    List_Items List_Id 645
-    646 record type element deployment_properties.aadl:67:23
-     Identifier Node_Id 647
-     647 identifier deployment_properties.aadl:67:23
-      Corresponding_Entity Node_Id 646
+   Expanded_Type_Designator Node_Id 666
+   666 record type deployment_properties.aadl:67:21
+    List_Items List_Id 647
+    648 record type element deployment_properties.aadl:67:23
+     Identifier Node_Id 649
+     649 identifier deployment_properties.aadl:67:23
+      Corresponding_Entity Node_Id 648
       Display_Name Name_Id "Targets"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean TRUE
-     Property_Type_Designator Node_Id 655
-     655 reference type deployment_properties.aadl:67:40
-      List_Items List_Id 648
-      649 reference category deployment_properties.aadl:67:51
+     Property_Type_Designator Node_Id 657
+     657 reference type deployment_properties.aadl:67:40
+      List_Items List_Id 650
+      651 reference category deployment_properties.aadl:67:51
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 1
        Classifier_Ref Node_Id 0
-      650 reference category deployment_properties.aadl:67:57
+      652 reference category deployment_properties.aadl:67:57
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 4
        Classifier_Ref Node_Id 0
-      651 reference category deployment_properties.aadl:68:03
+      653 reference category deployment_properties.aadl:68:03
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 6
        Classifier_Ref Node_Id 0
-      652 reference category deployment_properties.aadl:68:12
+      654 reference category deployment_properties.aadl:68:12
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
-      653 reference category deployment_properties.aadl:68:20
-       Identifier Node_Id 654
-       654 identifier deployment_properties.aadl:68:20
+      655 reference category deployment_properties.aadl:68:20
+       Identifier Node_Id 656
+       656 identifier deployment_properties.aadl:68:20
         Corresponding_Entity Node_Id 0
         Display_Name Name_Id "connection"
         Scope_Entity Node_Id 0
@@ -3066,165 +3076,165 @@ Declarations List_Id 7
        Category Byte 37
        Component_Cat Byte 14
        Classifier_Ref Node_Id 0
-    656 record type element deployment_properties.aadl:68:33
-     Identifier Node_Id 657
-     657 identifier deployment_properties.aadl:68:33
-      Corresponding_Entity Node_Id 656
+    658 record type element deployment_properties.aadl:68:33
+     Identifier Node_Id 659
+     659 identifier deployment_properties.aadl:68:33
+      Corresponding_Entity Node_Id 658
       Display_Name Name_Id "Location"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 663
-     663 classifier type deployment_properties.aadl:68:43
-      List_Items List_Id 658
-      659 classifier category ref deployment_properties.aadl:69:04
+     Property_Type_Designator Node_Id 665
+     665 classifier type deployment_properties.aadl:68:43
+      List_Items List_Id 660
+      661 classifier category ref deployment_properties.aadl:69:04
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 8
        Classifier_Ref Node_Id 0
-      660 classifier category ref deployment_properties.aadl:69:15
+      662 classifier category ref deployment_properties.aadl:69:15
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 7
        Classifier_Ref Node_Id 0
-      661 classifier category ref deployment_properties.aadl:69:23
+      663 classifier category ref deployment_properties.aadl:69:23
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 10
        Classifier_Ref Node_Id 0
-      662 classifier category ref deployment_properties.aadl:69:28
+      664 classifier category ref deployment_properties.aadl:69:28
        Identifier Node_Id 0
        Category Byte 11
        Component_Cat Byte 13
        Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 670
-  670 applies to deployment_properties.aadl:67:02
+  Applies_To Node_Id 672
+  672 applies to deployment_properties.aadl:67:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 666
-   667 named element deployment_properties.aadl:70:04
+   Owner_Categories List_Id 668
+   669 named element deployment_properties.aadl:70:04
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   668 named element deployment_properties.aadl:70:13
+   670 named element deployment_properties.aadl:70:13
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 685 property definition declaration deployment_properties.aadl:72:02
-  Identifier Node_Id 672
-  672 identifier deployment_properties.aadl:72:02
-   Corresponding_Entity Node_Id 685
+ 687 property definition declaration deployment_properties.aadl:72:02
+  Identifier Node_Id 674
+  674 identifier deployment_properties.aadl:72:02
+   Corresponding_Entity Node_Id 687
    Display_Name Name_Id "Allowed_Connection_Type"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 687
-  687 property type deployment_properties.aadl:72:02
+  Property_Name_Type Node_Id 689
+  689 property type deployment_properties.aadl:72:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 674
-   674 enumeration type deployment_properties.aadl:72:35
-    Identifiers List_Id 675
-    676 identifier deployment_properties.aadl:73:09
-     Corresponding_Entity Node_Id 674
+   Property_Type_Designator Node_Id 676
+   676 enumeration type deployment_properties.aadl:72:35
+    Identifiers List_Id 677
+    678 identifier deployment_properties.aadl:73:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Sampled_Data_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    677 identifier deployment_properties.aadl:73:34
-     Corresponding_Entity Node_Id 674
+    679 identifier deployment_properties.aadl:73:34
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Immediate_Data_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    678 identifier deployment_properties.aadl:74:09
-     Corresponding_Entity Node_Id 674
+    680 identifier deployment_properties.aadl:74:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Delayed_Data_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    679 identifier deployment_properties.aadl:74:34
-     Corresponding_Entity Node_Id 674
+    681 identifier deployment_properties.aadl:74:34
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Port_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    680 identifier deployment_properties.aadl:75:09
-     Corresponding_Entity Node_Id 674
+    682 identifier deployment_properties.aadl:75:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Data_Access_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    681 identifier deployment_properties.aadl:76:09
-     Corresponding_Entity Node_Id 674
+    683 identifier deployment_properties.aadl:76:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Subprogram_Access_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 674
-   674 enumeration type deployment_properties.aadl:72:35
-    Identifiers List_Id 675
-    676 identifier deployment_properties.aadl:73:09
-     Corresponding_Entity Node_Id 674
+   Expanded_Type_Designator Node_Id 676
+   676 enumeration type deployment_properties.aadl:72:35
+    Identifiers List_Id 677
+    678 identifier deployment_properties.aadl:73:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Sampled_Data_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    677 identifier deployment_properties.aadl:73:34
-     Corresponding_Entity Node_Id 674
+    679 identifier deployment_properties.aadl:73:34
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Immediate_Data_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    678 identifier deployment_properties.aadl:74:09
-     Corresponding_Entity Node_Id 674
+    680 identifier deployment_properties.aadl:74:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Delayed_Data_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    679 identifier deployment_properties.aadl:74:34
-     Corresponding_Entity Node_Id 674
+    681 identifier deployment_properties.aadl:74:34
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Port_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    680 identifier deployment_properties.aadl:75:09
-     Corresponding_Entity Node_Id 674
+    682 identifier deployment_properties.aadl:75:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Data_Access_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    681 identifier deployment_properties.aadl:76:09
-     Corresponding_Entity Node_Id 674
+    683 identifier deployment_properties.aadl:76:09
+     Corresponding_Entity Node_Id 676
      Display_Name Name_Id "Subprogram_Access_Connection"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 686
-  686 applies to deployment_properties.aadl:72:02
+  Applies_To Node_Id 688
+  688 applies to deployment_properties.aadl:72:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 682
-   683 named element deployment_properties.aadl:77:15
+   Owner_Categories List_Id 684
+   685 named element deployment_properties.aadl:77:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   684 named element deployment_properties.aadl:77:20
+   686 named element deployment_properties.aadl:77:20
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 695 property definition declaration deployment_properties.aadl:79:02
-  Identifier Node_Id 688
-  688 identifier deployment_properties.aadl:79:02
-   Corresponding_Entity Node_Id 695
+ 697 property definition declaration deployment_properties.aadl:79:02
+  Identifier Node_Id 690
+  690 identifier deployment_properties.aadl:79:02
+   Corresponding_Entity Node_Id 697
    Display_Name Name_Id "Allowed_Dispatch_Protocol"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 697
-  697 property type deployment_properties.aadl:79:02
+  Property_Name_Type Node_Id 699
+  699 property type deployment_properties.aadl:79:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 691
-   691 unique property type identifier deployment_properties.aadl:79:34
-    Identifier Node_Id 690
-    690 identifier deployment_properties.aadl:79:37
+   Property_Type_Designator Node_Id 693
+   693 unique property type identifier deployment_properties.aadl:79:34
+    Identifier Node_Id 692
+    692 identifier deployment_properties.aadl:79:37
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Dispatch_Protocols"
      Scope_Entity Node_Id 0
@@ -3271,307 +3281,307 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 696
-  696 applies to deployment_properties.aadl:79:02
+  Applies_To Node_Id 698
+  698 applies to deployment_properties.aadl:79:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 692
-   693 named element deployment_properties.aadl:80:15
+   Owner_Categories List_Id 694
+   695 named element deployment_properties.aadl:80:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   694 named element deployment_properties.aadl:80:26
+   696 named element deployment_properties.aadl:80:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 706 property definition declaration deployment_properties.aadl:82:02
-  Identifier Node_Id 698
-  698 identifier deployment_properties.aadl:82:02
-   Corresponding_Entity Node_Id 706
+ 708 property definition declaration deployment_properties.aadl:82:02
+  Identifier Node_Id 700
+  700 identifier deployment_properties.aadl:82:02
+   Corresponding_Entity Node_Id 708
    Display_Name Name_Id "Allowed_Period"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 708
-  708 property type deployment_properties.aadl:82:02
+  Property_Name_Type Node_Id 710
+  710 property type deployment_properties.aadl:82:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 701
-   701 unique property type identifier deployment_properties.aadl:82:23
-    Identifier Node_Id 700
-    700 identifier deployment_properties.aadl:82:26
+   Property_Type_Designator Node_Id 703
+   703 unique property type identifier deployment_properties.aadl:82:23
+    Identifier Node_Id 702
+    702 identifier deployment_properties.aadl:82:26
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2560
-   2560 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2561
-    2561 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2562
-     2562 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2563
-      2563 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2564
-       2564 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2562
+   2562 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2563
+    2563 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2564
+     2564 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2565
+      2565 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2566
+       2566 literal timing_properties.aadl:7:25
         Value Value_Id 61
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2565
-      2565 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2566
-       2566 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2567
+      2567 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2568
+       2568 literal aadl_project.aadl:107:30
         Value Value_Id 62
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 707
-  707 applies to deployment_properties.aadl:82:02
+  Applies_To Node_Id 709
+  709 applies to deployment_properties.aadl:82:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 702
-   703 named element deployment_properties.aadl:83:15
+   Owner_Categories List_Id 704
+   705 named element deployment_properties.aadl:83:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   704 named element deployment_properties.aadl:83:26
+   706 named element deployment_properties.aadl:83:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   705 named element deployment_properties.aadl:83:34
+   707 named element deployment_properties.aadl:83:34
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 719 property definition declaration deployment_properties.aadl:85:02
-  Identifier Node_Id 709
-  709 identifier deployment_properties.aadl:85:02
-   Corresponding_Entity Node_Id 719
+ 721 property definition declaration deployment_properties.aadl:85:02
+  Identifier Node_Id 711
+  711 identifier deployment_properties.aadl:85:02
+   Corresponding_Entity Node_Id 721
    Display_Name Name_Id "Allowed_Physical_Access_Class"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 721
-  721 property type deployment_properties.aadl:85:02
+  Property_Name_Type Node_Id 723
+  723 property type deployment_properties.aadl:85:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 716
-   716 classifier type deployment_properties.aadl:85:41
-    List_Items List_Id 711
-    712 classifier category ref deployment_properties.aadl:85:53
+   Property_Type_Designator Node_Id 718
+   718 classifier type deployment_properties.aadl:85:41
+    List_Items List_Id 713
+    714 classifier category ref deployment_properties.aadl:85:53
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    713 classifier category ref deployment_properties.aadl:85:61
+    715 classifier category ref deployment_properties.aadl:85:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    714 classifier category ref deployment_properties.aadl:85:72
+    716 classifier category ref deployment_properties.aadl:85:72
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    715 classifier category ref deployment_properties.aadl:85:80
+    717 classifier category ref deployment_properties.aadl:85:80
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 716
-   716 classifier type deployment_properties.aadl:85:41
-    List_Items List_Id 711
-    712 classifier category ref deployment_properties.aadl:85:53
+   Expanded_Type_Designator Node_Id 718
+   718 classifier type deployment_properties.aadl:85:41
+    List_Items List_Id 713
+    714 classifier category ref deployment_properties.aadl:85:53
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    713 classifier category ref deployment_properties.aadl:85:61
+    715 classifier category ref deployment_properties.aadl:85:61
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    714 classifier category ref deployment_properties.aadl:85:72
+    716 classifier category ref deployment_properties.aadl:85:72
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    715 classifier category ref deployment_properties.aadl:85:80
+    717 classifier category ref deployment_properties.aadl:85:80
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 720
-  720 applies to deployment_properties.aadl:85:02
+  Applies_To Node_Id 722
+  722 applies to deployment_properties.aadl:85:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 717
-   718 named element deployment_properties.aadl:86:15
+   Owner_Categories List_Id 719
+   720 named element deployment_properties.aadl:86:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
- 732 property definition declaration deployment_properties.aadl:88:02
-  Identifier Node_Id 722
-  722 identifier deployment_properties.aadl:88:02
-   Corresponding_Entity Node_Id 732
+ 734 property definition declaration deployment_properties.aadl:88:02
+  Identifier Node_Id 724
+  724 identifier deployment_properties.aadl:88:02
+   Corresponding_Entity Node_Id 734
    Display_Name Name_Id "Allowed_Physical_Access"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 734
-  734 property type deployment_properties.aadl:88:02
+  Property_Name_Type Node_Id 736
+  736 property type deployment_properties.aadl:88:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 729
-   729 reference type deployment_properties.aadl:88:35
-    List_Items List_Id 724
-    725 reference category deployment_properties.aadl:88:46
+   Property_Type_Designator Node_Id 731
+   731 reference type deployment_properties.aadl:88:35
+    List_Items List_Id 726
+    727 reference category deployment_properties.aadl:88:46
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    726 reference category deployment_properties.aadl:88:54
+    728 reference category deployment_properties.aadl:88:54
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    727 reference category deployment_properties.aadl:88:65
+    729 reference category deployment_properties.aadl:88:65
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    728 reference category deployment_properties.aadl:88:73
+    730 reference category deployment_properties.aadl:88:73
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 729
-   729 reference type deployment_properties.aadl:88:35
-    List_Items List_Id 724
-    725 reference category deployment_properties.aadl:88:46
+   Expanded_Type_Designator Node_Id 731
+   731 reference type deployment_properties.aadl:88:35
+    List_Items List_Id 726
+    727 reference category deployment_properties.aadl:88:46
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 12
      Classifier_Ref Node_Id 0
-    726 reference category deployment_properties.aadl:88:54
+    728 reference category deployment_properties.aadl:88:54
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-    727 reference category deployment_properties.aadl:88:65
+    729 reference category deployment_properties.aadl:88:65
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 7
      Classifier_Ref Node_Id 0
-    728 reference category deployment_properties.aadl:88:73
+    730 reference category deployment_properties.aadl:88:73
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 10
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 733
-  733 applies to deployment_properties.aadl:88:02
+  Applies_To Node_Id 735
+  735 applies to deployment_properties.aadl:88:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 730
-   731 named element deployment_properties.aadl:89:15
+   Owner_Categories List_Id 732
+   733 named element deployment_properties.aadl:89:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
- 747 property definition declaration deployment_properties.aadl:91:02
-  Identifier Node_Id 735
-  735 identifier deployment_properties.aadl:91:02
-   Corresponding_Entity Node_Id 747
+ 749 property definition declaration deployment_properties.aadl:91:02
+  Identifier Node_Id 737
+  737 identifier deployment_properties.aadl:91:02
+   Corresponding_Entity Node_Id 749
    Display_Name Name_Id "Memory_Protocol"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 749
-  749 property type deployment_properties.aadl:91:02
+  Property_Name_Type Node_Id 751
+  751 property type deployment_properties.aadl:91:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 736
-   736 enumeration type deployment_properties.aadl:91:19
-    Identifiers List_Id 737
-    738 identifier deployment_properties.aadl:91:32
-     Corresponding_Entity Node_Id 736
+   Property_Type_Designator Node_Id 738
+   738 enumeration type deployment_properties.aadl:91:19
+    Identifiers List_Id 739
+    740 identifier deployment_properties.aadl:91:32
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "execute_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    739 identifier deployment_properties.aadl:91:46
-     Corresponding_Entity Node_Id 736
+    741 identifier deployment_properties.aadl:91:46
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "read_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    740 identifier deployment_properties.aadl:91:57
-     Corresponding_Entity Node_Id 736
+    742 identifier deployment_properties.aadl:91:57
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "write_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    741 identifier deployment_properties.aadl:91:69
-     Corresponding_Entity Node_Id 736
+    743 identifier deployment_properties.aadl:91:69
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 736
-   736 enumeration type deployment_properties.aadl:91:19
-    Identifiers List_Id 737
-    738 identifier deployment_properties.aadl:91:32
-     Corresponding_Entity Node_Id 736
+   Expanded_Type_Designator Node_Id 738
+   738 enumeration type deployment_properties.aadl:91:19
+    Identifiers List_Id 739
+    740 identifier deployment_properties.aadl:91:32
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "execute_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    739 identifier deployment_properties.aadl:91:46
-     Corresponding_Entity Node_Id 736
+    741 identifier deployment_properties.aadl:91:46
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "read_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    740 identifier deployment_properties.aadl:91:57
-     Corresponding_Entity Node_Id 736
+    742 identifier deployment_properties.aadl:91:57
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "write_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    741 identifier deployment_properties.aadl:91:69
-     Corresponding_Entity Node_Id 736
+    743 identifier deployment_properties.aadl:91:69
+     Corresponding_Entity Node_Id 738
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 750
-  750 property value deployment_properties.aadl:91:02
-   Value_Container Node_Id 317
-   Single_Value Node_Id 2540
-   2540 enumeration term deployment_properties.aadl:91:81
-    Identifier Node_Id 742
-    742 identifier deployment_properties.aadl:91:84
+  Default_Value Node_Id 752
+  752 property value deployment_properties.aadl:91:02
+   Value_Container Node_Id 319
+   Single_Value Node_Id 2542
+   2542 enumeration term deployment_properties.aadl:91:81
+    Identifier Node_Id 744
+    744 identifier deployment_properties.aadl:91:84
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
@@ -3579,10 +3589,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2567
-   2567 enumeration term deployment_properties.aadl:91:81
-    Identifier Node_Id 742
-    742 identifier deployment_properties.aadl:91:84
+   Expanded_Single_Value Node_Id 2569
+   2569 enumeration term deployment_properties.aadl:91:81
+    Identifier Node_Id 744
+    744 identifier deployment_properties.aadl:91:84
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
@@ -3590,64 +3600,64 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 748
-  748 applies to deployment_properties.aadl:91:02
+  Applies_To Node_Id 750
+  750 applies to deployment_properties.aadl:91:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 745
-   746 named element deployment_properties.aadl:92:15
+   Owner_Categories List_Id 747
+   748 named element deployment_properties.aadl:92:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 757 property definition declaration deployment_properties.aadl:94:02
-  Identifier Node_Id 751
-  751 identifier deployment_properties.aadl:94:02
-   Corresponding_Entity Node_Id 757
+ 759 property definition declaration deployment_properties.aadl:94:02
+  Identifier Node_Id 753
+  753 identifier deployment_properties.aadl:94:02
+   Corresponding_Entity Node_Id 759
    Display_Name Name_Id "Runtime_Protection_Support"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 759
-  759 property type deployment_properties.aadl:94:02
+  Property_Name_Type Node_Id 761
+  761 property type deployment_properties.aadl:94:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 752
-   752 boolean type deployment_properties.aadl:94:31
-   Expanded_Type_Designator Node_Id 752
-   752 boolean type deployment_properties.aadl:94:31
+   Property_Type_Designator Node_Id 754
+   754 boolean type deployment_properties.aadl:94:31
+   Expanded_Type_Designator Node_Id 754
+   754 boolean type deployment_properties.aadl:94:31
   Default_Value Node_Id 0
-  Applies_To Node_Id 758
-  758 applies to deployment_properties.aadl:94:02
+  Applies_To Node_Id 760
+  760 applies to deployment_properties.aadl:94:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 754
-   755 named element deployment_properties.aadl:95:18
+   Owner_Categories List_Id 756
+   757 named element deployment_properties.aadl:95:18
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   756 named element deployment_properties.aadl:95:29
+   758 named element deployment_properties.aadl:95:29
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 767 property definition declaration deployment_properties.aadl:97:02
-  Identifier Node_Id 760
-  760 identifier deployment_properties.aadl:97:02
-   Corresponding_Entity Node_Id 767
+ 769 property definition declaration deployment_properties.aadl:97:02
+  Identifier Node_Id 762
+  762 identifier deployment_properties.aadl:97:02
+   Corresponding_Entity Node_Id 769
    Display_Name Name_Id "Scheduling_Protocol"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 769
-  769 property type deployment_properties.aadl:97:02
+  Property_Name_Type Node_Id 771
+  771 property type deployment_properties.aadl:97:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 763
-   763 unique property type identifier deployment_properties.aadl:97:36
-    Identifier Node_Id 762
-    762 identifier deployment_properties.aadl:97:39
+   Property_Type_Designator Node_Id 765
+   765 unique property type identifier deployment_properties.aadl:97:36
+    Identifier Node_Id 764
+    764 identifier deployment_properties.aadl:97:39
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Scheduling_Protocols"
      Scope_Entity Node_Id 0
@@ -3764,275 +3774,275 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 768
-  768 applies to deployment_properties.aadl:97:02
+  Applies_To Node_Id 770
+  770 applies to deployment_properties.aadl:97:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 764
-   765 named element deployment_properties.aadl:98:15
+   Owner_Categories List_Id 766
+   767 named element deployment_properties.aadl:98:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   766 named element deployment_properties.aadl:98:34
+   768 named element deployment_properties.aadl:98:34
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 775 property definition declaration deployment_properties.aadl:100:02
-  Identifier Node_Id 770
-  770 identifier deployment_properties.aadl:100:02
-   Corresponding_Entity Node_Id 775
+ 777 property definition declaration deployment_properties.aadl:100:02
+  Identifier Node_Id 772
+  772 identifier deployment_properties.aadl:100:02
+   Corresponding_Entity Node_Id 777
    Display_Name Name_Id "Preemptive_Scheduler"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 777
-  777 property type deployment_properties.aadl:100:02
+  Property_Name_Type Node_Id 779
+  779 property type deployment_properties.aadl:100:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 771
-   771 boolean type deployment_properties.aadl:100:24
-   Expanded_Type_Designator Node_Id 771
-   771 boolean type deployment_properties.aadl:100:24
+   Property_Type_Designator Node_Id 773
+   773 boolean type deployment_properties.aadl:100:24
+   Expanded_Type_Designator Node_Id 773
+   773 boolean type deployment_properties.aadl:100:24
   Default_Value Node_Id 0
-  Applies_To Node_Id 776
-  776 applies to deployment_properties.aadl:100:02
+  Applies_To Node_Id 778
+  778 applies to deployment_properties.aadl:100:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 773
-   774 named element deployment_properties.aadl:101:15
+   Owner_Categories List_Id 775
+   776 named element deployment_properties.aadl:101:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 789 property definition declaration deployment_properties.aadl:103:02
-  Identifier Node_Id 778
-  778 identifier deployment_properties.aadl:103:02
-   Corresponding_Entity Node_Id 789
+ 791 property definition declaration deployment_properties.aadl:103:02
+  Identifier Node_Id 780
+  780 identifier deployment_properties.aadl:103:02
+   Corresponding_Entity Node_Id 791
    Display_Name Name_Id "Thread_Limit"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 791
-  791 property type deployment_properties.aadl:103:02
+  Property_Name_Type Node_Id 793
+  793 property type deployment_properties.aadl:103:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 779
-   779 integer type deployment_properties.aadl:103:16
-    Type_Range Node_Id 784
-    784 number range deployment_properties.aadl:103:28
-     Lower_Bound Node_Id 780
-     780 signed aadlnumber deployment_properties.aadl:103:28
-      Number_Value Node_Id 781
-      781 literal deployment_properties.aadl:103:28
+   Property_Type_Designator Node_Id 781
+   781 integer type deployment_properties.aadl:103:16
+    Type_Range Node_Id 786
+    786 number range deployment_properties.aadl:103:28
+     Lower_Bound Node_Id 782
+     782 signed aadlnumber deployment_properties.aadl:103:28
+      Number_Value Node_Id 783
+      783 literal deployment_properties.aadl:103:28
        Value Value_Id 34
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 783
-     783 property term deployment_properties.aadl:103:30
-      Identifier Node_Id 782
-      782 identifier deployment_properties.aadl:103:33
+     Upper_Bound Node_Id 785
+     785 property term deployment_properties.aadl:103:30
+      Identifier Node_Id 784
+      784 identifier deployment_properties.aadl:103:33
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Max_Thread_Limit"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 192
+      Entity Node_Id 194
       Property_Set_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2568
-   2568 integer type deployment_properties.aadl:103:16
-    Type_Range Node_Id 2569
-    2569 number range deployment_properties.aadl:103:28
-     Lower_Bound Node_Id 2570
-     2570 signed aadlnumber deployment_properties.aadl:103:28
-      Number_Value Node_Id 2571
-      2571 literal deployment_properties.aadl:103:28
+   Expanded_Type_Designator Node_Id 2570
+   2570 integer type deployment_properties.aadl:103:16
+    Type_Range Node_Id 2571
+    2571 number range deployment_properties.aadl:103:28
+     Lower_Bound Node_Id 2572
+     2572 signed aadlnumber deployment_properties.aadl:103:28
+      Number_Value Node_Id 2573
+      2573 literal deployment_properties.aadl:103:28
        Value Value_Id 63
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 2572
-     2572 signed aadlnumber aadl_project.aadl:103:45
-      Number_Value Node_Id 2573
-      2573 literal aadl_project.aadl:103:45
+     Upper_Bound Node_Id 2574
+     2574 signed aadlnumber aadl_project.aadl:105:45
+      Number_Value Node_Id 2575
+      2575 literal aadl_project.aadl:105:45
        Value Value_Id 64
       Unit_Identifier Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 790
-  790 applies to deployment_properties.aadl:103:02
+  Applies_To Node_Id 792
+  792 applies to deployment_properties.aadl:103:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 786
-   787 named element deployment_properties.aadl:104:15
+   Owner_Categories List_Id 788
+   789 named element deployment_properties.aadl:104:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   788 named element deployment_properties.aadl:104:26
+   790 named element deployment_properties.aadl:104:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 798 property definition declaration deployment_properties.aadl:106:02
-  Identifier Node_Id 792
-  792 identifier deployment_properties.aadl:106:02
-   Corresponding_Entity Node_Id 798
+ 800 property definition declaration deployment_properties.aadl:106:02
+  Identifier Node_Id 794
+  794 identifier deployment_properties.aadl:106:02
+   Corresponding_Entity Node_Id 800
    Display_Name Name_Id "Priority_Map"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 800
-  800 property type deployment_properties.aadl:106:02
+  Property_Name_Type Node_Id 802
+  802 property type deployment_properties.aadl:106:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 795
-   795 unique property type identifier deployment_properties.aadl:106:21
-    Identifier Node_Id 794
-    794 identifier deployment_properties.aadl:106:24
+   Property_Type_Designator Node_Id 797
+   797 unique property type identifier deployment_properties.aadl:106:21
+    Identifier Node_Id 796
+    796 identifier deployment_properties.aadl:106:24
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Priority_Mapping"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 810
+    Entity Node_Id 812
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 809
-   809 record type deployment_properties.aadl:109:32
-    List_Items List_Id 802
-    803 record type element deployment_properties.aadl:110:03
-     Identifier Node_Id 804
-     804 identifier deployment_properties.aadl:110:03
-      Corresponding_Entity Node_Id 803
+   Expanded_Type_Designator Node_Id 811
+   811 record type deployment_properties.aadl:109:32
+    List_Items List_Id 804
+    805 record type element deployment_properties.aadl:110:03
+     Identifier Node_Id 806
+     806 identifier deployment_properties.aadl:110:03
+      Corresponding_Entity Node_Id 805
       Display_Name Name_Id "Aadl_Priority"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 805
-     805 integer type deployment_properties.aadl:110:18
+     Property_Type_Designator Node_Id 807
+     807 integer type deployment_properties.aadl:110:18
       Type_Range Node_Id 0
       Unit_Designator Node_Id 0
-    806 record type element deployment_properties.aadl:111:03
-     Identifier Node_Id 807
-     807 identifier deployment_properties.aadl:111:03
-      Corresponding_Entity Node_Id 806
+    808 record type element deployment_properties.aadl:111:03
+     Identifier Node_Id 809
+     809 identifier deployment_properties.aadl:111:03
+      Corresponding_Entity Node_Id 808
       Display_Name Name_Id "RTOS_Priority"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 808
-     808 integer type deployment_properties.aadl:111:18
+     Property_Type_Designator Node_Id 810
+     810 integer type deployment_properties.aadl:111:18
       Type_Range Node_Id 0
       Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 799
-  799 applies to deployment_properties.aadl:106:02
+  Applies_To Node_Id 801
+  801 applies to deployment_properties.aadl:106:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 796
-   797 named element deployment_properties.aadl:107:15
+   Owner_Categories List_Id 798
+   799 named element deployment_properties.aadl:107:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 810 property type declaration deployment_properties.aadl:109:02
-  Identifier Node_Id 801
-  801 identifier deployment_properties.aadl:109:02
-   Corresponding_Entity Node_Id 810
+ 812 property type declaration deployment_properties.aadl:109:02
+  Identifier Node_Id 803
+  803 identifier deployment_properties.aadl:109:02
+   Corresponding_Entity Node_Id 812
    Display_Name Name_Id "Priority_Mapping"
-   Scope_Entity Node_Id 318
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 809
-  809 record type deployment_properties.aadl:109:32
-   List_Items List_Id 802
-   803 record type element deployment_properties.aadl:110:03
-    Identifier Node_Id 804
-    804 identifier deployment_properties.aadl:110:03
-     Corresponding_Entity Node_Id 803
+   Scope_Entity Node_Id 320
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 811
+  811 record type deployment_properties.aadl:109:32
+   List_Items List_Id 804
+   805 record type element deployment_properties.aadl:110:03
+    Identifier Node_Id 806
+    806 identifier deployment_properties.aadl:110:03
+     Corresponding_Entity Node_Id 805
      Display_Name Name_Id "Aadl_Priority"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 805
-    805 integer type deployment_properties.aadl:110:18
+    Property_Type_Designator Node_Id 807
+    807 integer type deployment_properties.aadl:110:18
      Type_Range Node_Id 0
      Unit_Designator Node_Id 0
-   806 record type element deployment_properties.aadl:111:03
-    Identifier Node_Id 807
-    807 identifier deployment_properties.aadl:111:03
-     Corresponding_Entity Node_Id 806
+   808 record type element deployment_properties.aadl:111:03
+    Identifier Node_Id 809
+    809 identifier deployment_properties.aadl:111:03
+     Corresponding_Entity Node_Id 808
      Display_Name Name_Id "RTOS_Priority"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 808
-    808 integer type deployment_properties.aadl:111:18
+    Property_Type_Designator Node_Id 810
+    810 integer type deployment_properties.aadl:111:18
      Type_Range Node_Id 0
      Unit_Designator Node_Id 0
- 818 property definition declaration deployment_properties.aadl:113:02
-  Identifier Node_Id 811
-  811 identifier deployment_properties.aadl:113:02
-   Corresponding_Entity Node_Id 818
+ 820 property definition declaration deployment_properties.aadl:113:02
+  Identifier Node_Id 813
+  813 identifier deployment_properties.aadl:113:02
+   Corresponding_Entity Node_Id 820
    Display_Name Name_Id "Priority_Range"
-   Scope_Entity Node_Id 318
+   Scope_Entity Node_Id 320
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 820
-  820 property type deployment_properties.aadl:113:02
+  Property_Name_Type Node_Id 822
+  822 property type deployment_properties.aadl:113:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 812
-   812 range type deployment_properties.aadl:113:18
-    Number_Type Node_Id 813
-    813 integer type deployment_properties.aadl:113:27
+   Property_Type_Designator Node_Id 814
+   814 range type deployment_properties.aadl:113:18
+    Number_Type Node_Id 815
+    815 integer type deployment_properties.aadl:113:27
      Type_Range Node_Id 0
      Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2574
-   2574 range type deployment_properties.aadl:113:18
-    Number_Type Node_Id 2575
-    2575 integer type deployment_properties.aadl:113:27
+   Expanded_Type_Designator Node_Id 2576
+   2576 range type deployment_properties.aadl:113:18
+    Number_Type Node_Id 2577
+    2577 integer type deployment_properties.aadl:113:27
      Type_Range Node_Id 0
      Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 819
-  819 applies to deployment_properties.aadl:113:02
+  Applies_To Node_Id 821
+  821 applies to deployment_properties.aadl:113:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 815
-   816 named element deployment_properties.aadl:114:15
+   Owner_Categories List_Id 817
+   818 named element deployment_properties.aadl:114:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   817 named element deployment_properties.aadl:114:26
+   819 named element deployment_properties.aadl:114:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-822 property set thread_properties.aadl:6:01
- Identifier Node_Id 821
- 821 identifier thread_properties.aadl:6:14
-  Corresponding_Entity Node_Id 822
+824 property set thread_properties.aadl:6:01
+ Identifier Node_Id 823
+ 823 identifier thread_properties.aadl:6:14
+  Corresponding_Entity Node_Id 824
   Display_Name Name_Id "Thread_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 823
- Declarations List_Id 835
- 832 property definition declaration thread_properties.aadl:7:02
-  Identifier Node_Id 824
-  824 identifier thread_properties.aadl:7:02
-   Corresponding_Entity Node_Id 832
+ Entity_Scope Node_Id 825
+ Declarations List_Id 837
+ 834 property definition declaration thread_properties.aadl:7:02
+  Identifier Node_Id 826
+  826 identifier thread_properties.aadl:7:02
+   Corresponding_Entity Node_Id 834
    Display_Name Name_Id "Dispatch_Protocol"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 834
-  834 property type thread_properties.aadl:7:02
+  Property_Name_Type Node_Id 836
+  836 property type thread_properties.aadl:7:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 826
-   826 unique property type identifier thread_properties.aadl:7:19
-    Identifier Node_Id 825
-    825 identifier thread_properties.aadl:7:21
+   Property_Type_Designator Node_Id 828
+   828 unique property type identifier thread_properties.aadl:7:19
+    Identifier Node_Id 827
+    827 identifier thread_properties.aadl:7:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Dispatch_Protocols"
      Scope_Entity Node_Id 0
@@ -4079,322 +4089,322 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 833
-  833 applies to thread_properties.aadl:7:02
+  Applies_To Node_Id 835
+  835 applies to thread_properties.aadl:7:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 828
-   829 named element thread_properties.aadl:8:15
+   Owner_Categories List_Id 830
+   831 named element thread_properties.aadl:8:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   830 named element thread_properties.aadl:8:23
+   832 named element thread_properties.aadl:8:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   831 named element thread_properties.aadl:8:31
+   833 named element thread_properties.aadl:8:31
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 844 property definition declaration thread_properties.aadl:10:02
-  Identifier Node_Id 836
-  836 identifier thread_properties.aadl:10:02
-   Corresponding_Entity Node_Id 844
+ 846 property definition declaration thread_properties.aadl:10:02
+  Identifier Node_Id 838
+  838 identifier thread_properties.aadl:10:02
+   Corresponding_Entity Node_Id 846
    Display_Name Name_Id "Dispatch_Trigger"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 846
-  846 property type thread_properties.aadl:10:02
+  Property_Name_Type Node_Id 848
+  848 property type thread_properties.aadl:10:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 840
-   840 reference type thread_properties.aadl:10:28
-    List_Items List_Id 838
-    839 reference category thread_properties.aadl:10:39
+   Property_Type_Designator Node_Id 842
+   842 reference type thread_properties.aadl:10:28
+    List_Items List_Id 840
+    841 reference category thread_properties.aadl:10:39
      Identifier Node_Id 0
      Category Byte 14
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 840
-   840 reference type thread_properties.aadl:10:28
-    List_Items List_Id 838
-    839 reference category thread_properties.aadl:10:39
+   Expanded_Type_Designator Node_Id 842
+   842 reference type thread_properties.aadl:10:28
+    List_Items List_Id 840
+    841 reference category thread_properties.aadl:10:39
      Identifier Node_Id 0
      Category Byte 14
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 845
-  845 applies to thread_properties.aadl:10:02
+  Applies_To Node_Id 847
+  847 applies to thread_properties.aadl:10:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 841
-   842 named element thread_properties.aadl:11:15
+   Owner_Categories List_Id 843
+   844 named element thread_properties.aadl:11:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   843 named element thread_properties.aadl:11:23
+   845 named element thread_properties.aadl:11:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 852 property definition declaration thread_properties.aadl:13:02
-  Identifier Node_Id 847
-  847 identifier thread_properties.aadl:13:02
-   Corresponding_Entity Node_Id 852
+ 854 property definition declaration thread_properties.aadl:13:02
+  Identifier Node_Id 849
+  849 identifier thread_properties.aadl:13:02
+   Corresponding_Entity Node_Id 854
    Display_Name Name_Id "Dispatch_Able"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 854
-  854 property type thread_properties.aadl:13:02
+  Property_Name_Type Node_Id 856
+  856 property type thread_properties.aadl:13:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 848
-   848 boolean type thread_properties.aadl:13:17
-   Expanded_Type_Designator Node_Id 848
-   848 boolean type thread_properties.aadl:13:17
+   Property_Type_Designator Node_Id 850
+   850 boolean type thread_properties.aadl:13:17
+   Expanded_Type_Designator Node_Id 850
+   850 boolean type thread_properties.aadl:13:17
   Default_Value Node_Id 0
-  Applies_To Node_Id 853
-  853 applies to thread_properties.aadl:13:02
+  Applies_To Node_Id 855
+  855 applies to thread_properties.aadl:13:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 850
-   851 named element thread_properties.aadl:13:41
+   Owner_Categories List_Id 852
+   853 named element thread_properties.aadl:13:41
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 865 property definition declaration thread_properties.aadl:15:02
-  Identifier Node_Id 855
-  855 identifier thread_properties.aadl:15:02
-   Corresponding_Entity Node_Id 865
+ 867 property definition declaration thread_properties.aadl:15:02
+  Identifier Node_Id 857
+  857 identifier thread_properties.aadl:15:02
+   Corresponding_Entity Node_Id 867
    Display_Name Name_Id "POSIX_Scheduling_Policy"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 867
-  867 property type thread_properties.aadl:15:02
+  Property_Name_Type Node_Id 869
+  869 property type thread_properties.aadl:15:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 856
-   856 enumeration type thread_properties.aadl:15:27
-    Identifiers List_Id 857
-    858 identifier thread_properties.aadl:15:40
-     Corresponding_Entity Node_Id 856
+   Property_Type_Designator Node_Id 858
+   858 enumeration type thread_properties.aadl:15:27
+    Identifiers List_Id 859
+    860 identifier thread_properties.aadl:15:40
+     Corresponding_Entity Node_Id 858
      Display_Name Name_Id "SCHED_FIFO"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    859 identifier thread_properties.aadl:15:52
-     Corresponding_Entity Node_Id 856
+    861 identifier thread_properties.aadl:15:52
+     Corresponding_Entity Node_Id 858
      Display_Name Name_Id "SCHED_RR"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    860 identifier thread_properties.aadl:15:62
-     Corresponding_Entity Node_Id 856
+    862 identifier thread_properties.aadl:15:62
+     Corresponding_Entity Node_Id 858
      Display_Name Name_Id "SCHED_OTHERS"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 856
-   856 enumeration type thread_properties.aadl:15:27
-    Identifiers List_Id 857
-    858 identifier thread_properties.aadl:15:40
-     Corresponding_Entity Node_Id 856
+   Expanded_Type_Designator Node_Id 858
+   858 enumeration type thread_properties.aadl:15:27
+    Identifiers List_Id 859
+    860 identifier thread_properties.aadl:15:40
+     Corresponding_Entity Node_Id 858
      Display_Name Name_Id "SCHED_FIFO"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    859 identifier thread_properties.aadl:15:52
-     Corresponding_Entity Node_Id 856
+    861 identifier thread_properties.aadl:15:52
+     Corresponding_Entity Node_Id 858
      Display_Name Name_Id "SCHED_RR"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    860 identifier thread_properties.aadl:15:62
-     Corresponding_Entity Node_Id 856
+    862 identifier thread_properties.aadl:15:62
+     Corresponding_Entity Node_Id 858
      Display_Name Name_Id "SCHED_OTHERS"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 866
-  866 applies to thread_properties.aadl:15:02
+  Applies_To Node_Id 868
+  868 applies to thread_properties.aadl:15:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 862
-   863 named element thread_properties.aadl:16:15
+   Owner_Categories List_Id 864
+   865 named element thread_properties.aadl:16:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   864 named element thread_properties.aadl:16:23
+   866 named element thread_properties.aadl:16:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
- 878 property definition declaration thread_properties.aadl:18:02
-  Identifier Node_Id 868
-  868 identifier thread_properties.aadl:18:02
-   Corresponding_Entity Node_Id 878
+ 880 property definition declaration thread_properties.aadl:18:02
+  Identifier Node_Id 870
+  870 identifier thread_properties.aadl:18:02
+   Corresponding_Entity Node_Id 880
    Display_Name Name_Id "Priority"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 880
-  880 property type thread_properties.aadl:18:02
+  Property_Name_Type Node_Id 882
+  882 property type thread_properties.aadl:18:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 869
-   869 integer type thread_properties.aadl:18:20
+   Property_Type_Designator Node_Id 871
+   871 integer type thread_properties.aadl:18:20
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2576
-   2576 integer type thread_properties.aadl:18:20
+   Expanded_Type_Designator Node_Id 2578
+   2578 integer type thread_properties.aadl:18:20
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 879
-  879 applies to thread_properties.aadl:18:02
+  Applies_To Node_Id 881
+  881 applies to thread_properties.aadl:18:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 871
-   872 named element thread_properties.aadl:19:15
+   Owner_Categories List_Id 873
+   874 named element thread_properties.aadl:19:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   873 named element thread_properties.aadl:19:23
+   875 named element thread_properties.aadl:19:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   874 named element thread_properties.aadl:19:37
+   876 named element thread_properties.aadl:19:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   875 named element thread_properties.aadl:19:46
+   877 named element thread_properties.aadl:19:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   876 named element thread_properties.aadl:19:54
+   878 named element thread_properties.aadl:19:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   877 named element thread_properties.aadl:19:62
+   879 named element thread_properties.aadl:19:62
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
- 887 property definition declaration thread_properties.aadl:22:02
-  Identifier Node_Id 881
-  881 identifier thread_properties.aadl:22:02
-   Corresponding_Entity Node_Id 887
+ 889 property definition declaration thread_properties.aadl:22:02
+  Identifier Node_Id 883
+  883 identifier thread_properties.aadl:22:02
+   Corresponding_Entity Node_Id 889
    Display_Name Name_Id "Criticality"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 889
-  889 property type thread_properties.aadl:22:02
+  Property_Name_Type Node_Id 891
+  891 property type thread_properties.aadl:22:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 882
-   882 integer type thread_properties.aadl:22:15
+   Property_Type_Designator Node_Id 884
+   884 integer type thread_properties.aadl:22:15
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2577
-   2577 integer type thread_properties.aadl:22:15
+   Expanded_Type_Designator Node_Id 2579
+   2579 integer type thread_properties.aadl:22:15
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 888
-  888 applies to thread_properties.aadl:22:02
+  Applies_To Node_Id 890
+  890 applies to thread_properties.aadl:22:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 884
-   885 named element thread_properties.aadl:23:15
+   Owner_Categories List_Id 886
+   887 named element thread_properties.aadl:23:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   886 named element thread_properties.aadl:23:23
+   888 named element thread_properties.aadl:23:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
- 899 property definition declaration thread_properties.aadl:25:02
-  Identifier Node_Id 890
-  890 identifier thread_properties.aadl:25:02
-   Corresponding_Entity Node_Id 899
+ 901 property definition declaration thread_properties.aadl:25:02
+  Identifier Node_Id 892
+  892 identifier thread_properties.aadl:25:02
+   Corresponding_Entity Node_Id 901
    Display_Name Name_Id "Time_Slot"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 901
-  901 property type thread_properties.aadl:25:02
+  Property_Name_Type Node_Id 903
+  903 property type thread_properties.aadl:25:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 892
-   892 integer type thread_properties.aadl:25:21
+   Property_Type_Designator Node_Id 894
+   894 integer type thread_properties.aadl:25:21
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2578
-   2578 integer type thread_properties.aadl:25:21
+   Expanded_Type_Designator Node_Id 2580
+   2580 integer type thread_properties.aadl:25:21
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 900
-  900 applies to thread_properties.aadl:25:02
+  Applies_To Node_Id 902
+  902 applies to thread_properties.aadl:25:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 893
-   894 named element thread_properties.aadl:26:15
+   Owner_Categories List_Id 895
+   896 named element thread_properties.aadl:26:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   895 named element thread_properties.aadl:26:23
+   897 named element thread_properties.aadl:26:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   896 named element thread_properties.aadl:26:37
+   898 named element thread_properties.aadl:26:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   897 named element thread_properties.aadl:26:46
+   899 named element thread_properties.aadl:26:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   898 named element thread_properties.aadl:26:65
+   900 named element thread_properties.aadl:26:65
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 908 property definition declaration thread_properties.aadl:28:02
-  Identifier Node_Id 902
-  902 identifier thread_properties.aadl:28:02
-   Corresponding_Entity Node_Id 908
+ 910 property definition declaration thread_properties.aadl:28:02
+  Identifier Node_Id 904
+  904 identifier thread_properties.aadl:28:02
+   Corresponding_Entity Node_Id 910
    Display_Name Name_Id "Concurrency_Control_Protocol"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 910
-  910 property type thread_properties.aadl:28:02
+  Property_Name_Type Node_Id 912
+  912 property type thread_properties.aadl:28:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 904
-   904 unique property type identifier thread_properties.aadl:28:30
-    Identifier Node_Id 903
-    903 identifier thread_properties.aadl:28:32
+   Property_Type_Designator Node_Id 906
+   906 unique property type identifier thread_properties.aadl:28:30
+    Identifier Node_Id 905
+    905 identifier thread_properties.aadl:28:32
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Concurrency_Control_Protocols"
      Scope_Entity Node_Id 0
@@ -4456,139 +4466,139 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 909
-  909 applies to thread_properties.aadl:28:02
+  Applies_To Node_Id 911
+  911 applies to thread_properties.aadl:28:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 906
-   907 named element thread_properties.aadl:29:15
+   Owner_Categories List_Id 908
+   909 named element thread_properties.aadl:29:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
- 922 property definition declaration thread_properties.aadl:31:02
-  Identifier Node_Id 911
-  911 identifier thread_properties.aadl:31:02
-   Corresponding_Entity Node_Id 922
+ 924 property definition declaration thread_properties.aadl:31:02
+  Identifier Node_Id 913
+  913 identifier thread_properties.aadl:31:02
+   Corresponding_Entity Node_Id 924
    Display_Name Name_Id "Urgency"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 924
-  924 property type thread_properties.aadl:31:02
+  Property_Name_Type Node_Id 926
+  926 property type thread_properties.aadl:31:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 912
-   912 integer type thread_properties.aadl:31:11
-    Type_Range Node_Id 917
-    917 number range thread_properties.aadl:31:23
-     Lower_Bound Node_Id 913
-     913 signed aadlnumber thread_properties.aadl:31:23
-      Number_Value Node_Id 914
-      914 literal thread_properties.aadl:31:23
+   Property_Type_Designator Node_Id 914
+   914 integer type thread_properties.aadl:31:11
+    Type_Range Node_Id 919
+    919 number range thread_properties.aadl:31:23
+     Lower_Bound Node_Id 915
+     915 signed aadlnumber thread_properties.aadl:31:23
+      Number_Value Node_Id 916
+      916 literal thread_properties.aadl:31:23
        Value Value_Id 35
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 916
-     916 property term thread_properties.aadl:31:25
-      Identifier Node_Id 915
-      915 identifier thread_properties.aadl:31:28
+     Upper_Bound Node_Id 918
+     918 property term thread_properties.aadl:31:25
+      Identifier Node_Id 917
+      917 identifier thread_properties.aadl:31:28
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Max_Urgency"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 206
+      Entity Node_Id 208
       Property_Set_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2579
-   2579 integer type thread_properties.aadl:31:11
-    Type_Range Node_Id 2580
-    2580 number range thread_properties.aadl:31:23
-     Lower_Bound Node_Id 2581
-     2581 signed aadlnumber thread_properties.aadl:31:23
-      Number_Value Node_Id 2582
-      2582 literal thread_properties.aadl:31:23
+   Expanded_Type_Designator Node_Id 2581
+   2581 integer type thread_properties.aadl:31:11
+    Type_Range Node_Id 2582
+    2582 number range thread_properties.aadl:31:23
+     Lower_Bound Node_Id 2583
+     2583 signed aadlnumber thread_properties.aadl:31:23
+      Number_Value Node_Id 2584
+      2584 literal thread_properties.aadl:31:23
        Value Value_Id 65
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 2583
-     2583 signed aadlnumber aadl_project.aadl:107:40
-      Number_Value Node_Id 2584
-      2584 literal aadl_project.aadl:107:40
+     Upper_Bound Node_Id 2585
+     2585 signed aadlnumber aadl_project.aadl:109:40
+      Number_Value Node_Id 2586
+      2586 literal aadl_project.aadl:109:40
        Value Value_Id 66
       Unit_Identifier Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 923
-  923 applies to thread_properties.aadl:31:02
+  Applies_To Node_Id 925
+  925 applies to thread_properties.aadl:31:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 919
-   920 named element thread_properties.aadl:32:15
+   Owner_Categories List_Id 921
+   922 named element thread_properties.aadl:32:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   921 named element thread_properties.aadl:32:21
+   923 named element thread_properties.aadl:32:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 937 property definition declaration thread_properties.aadl:34:02
-  Identifier Node_Id 925
-  925 identifier thread_properties.aadl:34:02
-   Corresponding_Entity Node_Id 937
+ 939 property definition declaration thread_properties.aadl:34:02
+  Identifier Node_Id 927
+  927 identifier thread_properties.aadl:34:02
+   Corresponding_Entity Node_Id 939
    Display_Name Name_Id "Dequeue_Protocol"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 939
-  939 property type thread_properties.aadl:34:02
+  Property_Name_Type Node_Id 941
+  941 property type thread_properties.aadl:34:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 926
-   926 enumeration type thread_properties.aadl:34:20
-    Identifiers List_Id 927
-    928 identifier thread_properties.aadl:34:33
-     Corresponding_Entity Node_Id 926
+   Property_Type_Designator Node_Id 928
+   928 enumeration type thread_properties.aadl:34:20
+    Identifiers List_Id 929
+    930 identifier thread_properties.aadl:34:33
+     Corresponding_Entity Node_Id 928
      Display_Name Name_Id "OneItem"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    929 identifier thread_properties.aadl:34:42
-     Corresponding_Entity Node_Id 926
+    931 identifier thread_properties.aadl:34:42
+     Corresponding_Entity Node_Id 928
      Display_Name Name_Id "MultipleItems"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    930 identifier thread_properties.aadl:34:57
-     Corresponding_Entity Node_Id 926
+    932 identifier thread_properties.aadl:34:57
+     Corresponding_Entity Node_Id 928
      Display_Name Name_Id "AllItems"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 926
-   926 enumeration type thread_properties.aadl:34:20
-    Identifiers List_Id 927
-    928 identifier thread_properties.aadl:34:33
-     Corresponding_Entity Node_Id 926
+   Expanded_Type_Designator Node_Id 928
+   928 enumeration type thread_properties.aadl:34:20
+    Identifiers List_Id 929
+    930 identifier thread_properties.aadl:34:33
+     Corresponding_Entity Node_Id 928
      Display_Name Name_Id "OneItem"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    929 identifier thread_properties.aadl:34:42
-     Corresponding_Entity Node_Id 926
+    931 identifier thread_properties.aadl:34:42
+     Corresponding_Entity Node_Id 928
      Display_Name Name_Id "MultipleItems"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    930 identifier thread_properties.aadl:34:57
-     Corresponding_Entity Node_Id 926
+    932 identifier thread_properties.aadl:34:57
+     Corresponding_Entity Node_Id 928
      Display_Name Name_Id "AllItems"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 940
-  940 property value thread_properties.aadl:34:02
-   Value_Container Node_Id 822
-   Single_Value Node_Id 2541
-   2541 enumeration term thread_properties.aadl:34:67
-    Identifier Node_Id 931
-    931 identifier thread_properties.aadl:34:70
+  Default_Value Node_Id 942
+  942 property value thread_properties.aadl:34:02
+   Value_Container Node_Id 824
+   Single_Value Node_Id 2543
+   2543 enumeration term thread_properties.aadl:34:67
+    Identifier Node_Id 933
+    933 identifier thread_properties.aadl:34:70
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "OneItem"
      Scope_Entity Node_Id 0
@@ -4596,10 +4606,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2585
-   2585 enumeration term thread_properties.aadl:34:67
-    Identifier Node_Id 931
-    931 identifier thread_properties.aadl:34:70
+   Expanded_Single_Value Node_Id 2587
+   2587 enumeration term thread_properties.aadl:34:67
+    Identifier Node_Id 933
+    933 identifier thread_properties.aadl:34:70
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "OneItem"
      Scope_Entity Node_Id 0
@@ -4607,230 +4617,230 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 938
-  938 applies to thread_properties.aadl:34:02
+  Applies_To Node_Id 940
+  940 applies to thread_properties.aadl:34:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 934
-   935 named element thread_properties.aadl:35:15
+   Owner_Categories List_Id 936
+   937 named element thread_properties.aadl:35:15
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   936 named element thread_properties.aadl:35:27
+   938 named element thread_properties.aadl:35:27
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 947 property definition declaration thread_properties.aadl:37:02
-  Identifier Node_Id 941
-  941 identifier thread_properties.aadl:37:02
-   Corresponding_Entity Node_Id 947
+ 949 property definition declaration thread_properties.aadl:37:02
+  Identifier Node_Id 943
+  943 identifier thread_properties.aadl:37:02
+   Corresponding_Entity Node_Id 949
    Display_Name Name_Id "Dequeued_Items"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 949
-  949 property type thread_properties.aadl:37:02
+  Property_Name_Type Node_Id 951
+  951 property type thread_properties.aadl:37:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 942
-   942 integer type thread_properties.aadl:37:18
+   Property_Type_Designator Node_Id 944
+   944 integer type thread_properties.aadl:37:18
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2586
-   2586 integer type thread_properties.aadl:37:18
+   Expanded_Type_Designator Node_Id 2588
+   2588 integer type thread_properties.aadl:37:18
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 948
-  948 applies to thread_properties.aadl:37:02
+  Applies_To Node_Id 950
+  950 applies to thread_properties.aadl:37:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 944
-   945 named element thread_properties.aadl:38:15
+   Owner_Categories List_Id 946
+   947 named element thread_properties.aadl:38:15
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   946 named element thread_properties.aadl:38:27
+   948 named element thread_properties.aadl:38:27
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 958 property definition declaration thread_properties.aadl:40:02
-  Identifier Node_Id 950
-  950 identifier thread_properties.aadl:40:02
-   Corresponding_Entity Node_Id 958
+ 960 property definition declaration thread_properties.aadl:40:02
+  Identifier Node_Id 952
+  952 identifier thread_properties.aadl:40:02
+   Corresponding_Entity Node_Id 960
    Display_Name Name_Id "Mode_Transition_Response"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 960
-  960 property type thread_properties.aadl:40:02
+  Property_Name_Type Node_Id 962
+  962 property type thread_properties.aadl:40:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 951
-   951 enumeration type thread_properties.aadl:40:28
-    Identifiers List_Id 952
-    953 identifier thread_properties.aadl:40:41
-     Corresponding_Entity Node_Id 951
+   Property_Type_Designator Node_Id 953
+   953 enumeration type thread_properties.aadl:40:28
+    Identifiers List_Id 954
+    955 identifier thread_properties.aadl:40:41
+     Corresponding_Entity Node_Id 953
      Display_Name Name_Id "emergency"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    954 identifier thread_properties.aadl:40:52
-     Corresponding_Entity Node_Id 951
+    956 identifier thread_properties.aadl:40:52
+     Corresponding_Entity Node_Id 953
      Display_Name Name_Id "planned"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 951
-   951 enumeration type thread_properties.aadl:40:28
-    Identifiers List_Id 952
-    953 identifier thread_properties.aadl:40:41
-     Corresponding_Entity Node_Id 951
+   Expanded_Type_Designator Node_Id 953
+   953 enumeration type thread_properties.aadl:40:28
+    Identifiers List_Id 954
+    955 identifier thread_properties.aadl:40:41
+     Corresponding_Entity Node_Id 953
      Display_Name Name_Id "emergency"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    954 identifier thread_properties.aadl:40:52
-     Corresponding_Entity Node_Id 951
+    956 identifier thread_properties.aadl:40:52
+     Corresponding_Entity Node_Id 953
      Display_Name Name_Id "planned"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 959
-  959 applies to thread_properties.aadl:40:02
+  Applies_To Node_Id 961
+  961 applies to thread_properties.aadl:40:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 956
-   957 named element thread_properties.aadl:41:15
+   Owner_Categories List_Id 958
+   959 named element thread_properties.aadl:41:15
     Identifier Node_Id 0
     Category Byte 52
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 980 property definition declaration thread_properties.aadl:43:02
-  Identifier Node_Id 961
-  961 identifier thread_properties.aadl:43:02
-   Corresponding_Entity Node_Id 980
+ 982 property definition declaration thread_properties.aadl:43:02
+  Identifier Node_Id 963
+  963 identifier thread_properties.aadl:43:02
+   Corresponding_Entity Node_Id 982
    Display_Name Name_Id "Resumption_Policy"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 982
-  982 property type thread_properties.aadl:43:02
+  Property_Name_Type Node_Id 984
+  984 property type thread_properties.aadl:43:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 962
-   962 enumeration type thread_properties.aadl:43:21
-    Identifiers List_Id 963
-    964 identifier thread_properties.aadl:43:34
-     Corresponding_Entity Node_Id 962
+   Property_Type_Designator Node_Id 964
+   964 enumeration type thread_properties.aadl:43:21
+    Identifiers List_Id 965
+    966 identifier thread_properties.aadl:43:34
+     Corresponding_Entity Node_Id 964
      Display_Name Name_Id "restart"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    965 identifier thread_properties.aadl:43:43
-     Corresponding_Entity Node_Id 962
+    967 identifier thread_properties.aadl:43:43
+     Corresponding_Entity Node_Id 964
      Display_Name Name_Id "resume"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 962
-   962 enumeration type thread_properties.aadl:43:21
-    Identifiers List_Id 963
-    964 identifier thread_properties.aadl:43:34
-     Corresponding_Entity Node_Id 962
+   Expanded_Type_Designator Node_Id 964
+   964 enumeration type thread_properties.aadl:43:21
+    Identifiers List_Id 965
+    966 identifier thread_properties.aadl:43:34
+     Corresponding_Entity Node_Id 964
      Display_Name Name_Id "restart"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    965 identifier thread_properties.aadl:43:43
-     Corresponding_Entity Node_Id 962
+    967 identifier thread_properties.aadl:43:43
+     Corresponding_Entity Node_Id 964
      Display_Name Name_Id "resume"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 981
-  981 applies to thread_properties.aadl:43:02
+  Applies_To Node_Id 983
+  983 applies to thread_properties.aadl:43:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 967
-   968 named element thread_properties.aadl:44:15
+   Owner_Categories List_Id 969
+   970 named element thread_properties.aadl:44:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   969 named element thread_properties.aadl:44:23
+   971 named element thread_properties.aadl:44:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   970 named element thread_properties.aadl:44:37
+   972 named element thread_properties.aadl:44:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   971 named element thread_properties.aadl:44:46
+   973 named element thread_properties.aadl:44:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   972 named element thread_properties.aadl:44:54
+   974 named element thread_properties.aadl:44:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   973 named element thread_properties.aadl:44:62
+   975 named element thread_properties.aadl:44:62
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   974 named element thread_properties.aadl:44:73
+   976 named element thread_properties.aadl:44:73
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   975 named element thread_properties.aadl:44:81
+   977 named element thread_properties.aadl:44:81
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   976 named element thread_properties.aadl:44:86
+   978 named element thread_properties.aadl:44:86
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   977 named element thread_properties.aadl:44:94
+   979 named element thread_properties.aadl:44:94
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   978 named element thread_properties.aadl:44:107
+   980 named element thread_properties.aadl:44:107
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   979 named element thread_properties.aadl:44:126
+   981 named element thread_properties.aadl:44:126
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 994 property definition declaration thread_properties.aadl:46:02
-  Identifier Node_Id 983
-  983 identifier thread_properties.aadl:46:02
-   Corresponding_Entity Node_Id 994
+ 996 property definition declaration thread_properties.aadl:46:02
+  Identifier Node_Id 985
+  985 identifier thread_properties.aadl:46:02
+   Corresponding_Entity Node_Id 996
    Display_Name Name_Id "Active_Thread_Handling_Protocol"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 996
-  996 property type thread_properties.aadl:46:02
+  Property_Name_Type Node_Id 998
+  998 property type thread_properties.aadl:46:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 985
-   985 unique property type identifier thread_properties.aadl:47:03
-    Identifier Node_Id 984
-    984 identifier thread_properties.aadl:47:11
+   Property_Type_Designator Node_Id 987
+   987 unique property type identifier thread_properties.aadl:47:03
+    Identifier Node_Id 986
+    986 identifier thread_properties.aadl:47:11
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Active_Thread_Handling_Protocols"
      Scope_Entity Node_Id 0
@@ -4846,13 +4856,13 @@ Declarations List_Id 7
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 997
-  997 property value thread_properties.aadl:46:02
-   Value_Container Node_Id 822
-   Single_Value Node_Id 2542
-   2542 enumeration term thread_properties.aadl:47:54
-    Identifier Node_Id 986
-    986 identifier thread_properties.aadl:47:57
+  Default_Value Node_Id 999
+  999 property value thread_properties.aadl:46:02
+   Value_Container Node_Id 824
+   Single_Value Node_Id 2544
+   2544 enumeration term thread_properties.aadl:47:54
+    Identifier Node_Id 988
+    988 identifier thread_properties.aadl:47:57
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "abort"
      Scope_Entity Node_Id 0
@@ -4860,10 +4870,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2587
-   2587 enumeration term thread_properties.aadl:47:54
-    Identifier Node_Id 986
-    986 identifier thread_properties.aadl:47:57
+   Expanded_Single_Value Node_Id 2589
+   2589 enumeration term thread_properties.aadl:47:54
+    Identifier Node_Id 988
+    988 identifier thread_properties.aadl:47:57
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "abort"
      Scope_Entity Node_Id 0
@@ -4871,78 +4881,78 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 995
-  995 applies to thread_properties.aadl:46:02
+  Applies_To Node_Id 997
+  997 applies to thread_properties.aadl:46:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 989
-   990 named element thread_properties.aadl:48:15
+   Owner_Categories List_Id 991
+   992 named element thread_properties.aadl:48:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   991 named element thread_properties.aadl:48:23
+   993 named element thread_properties.aadl:48:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   992 named element thread_properties.aadl:48:37
+   994 named element thread_properties.aadl:48:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   993 named element thread_properties.aadl:48:46
+   995 named element thread_properties.aadl:48:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 1011 property definition declaration thread_properties.aadl:50:02
-  Identifier Node_Id 998
-  998 identifier thread_properties.aadl:50:02
-   Corresponding_Entity Node_Id 1011
+ 1013 property definition declaration thread_properties.aadl:50:02
+  Identifier Node_Id 1000
+  1000 identifier thread_properties.aadl:50:02
+   Corresponding_Entity Node_Id 1013
    Display_Name Name_Id "Active_Thread_Queue_Handling_Protocol"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1013
-  1013 property type thread_properties.aadl:50:02
+  Property_Name_Type Node_Id 1015
+  1015 property type thread_properties.aadl:50:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 999
-   999 enumeration type thread_properties.aadl:51:11
-    Identifiers List_Id 1000
-    1001 identifier thread_properties.aadl:51:24
-     Corresponding_Entity Node_Id 999
+   Property_Type_Designator Node_Id 1001
+   1001 enumeration type thread_properties.aadl:51:11
+    Identifiers List_Id 1002
+    1003 identifier thread_properties.aadl:51:24
+     Corresponding_Entity Node_Id 1001
      Display_Name Name_Id "flush"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1002 identifier thread_properties.aadl:51:31
-     Corresponding_Entity Node_Id 999
+    1004 identifier thread_properties.aadl:51:31
+     Corresponding_Entity Node_Id 1001
      Display_Name Name_Id "hold"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 999
-   999 enumeration type thread_properties.aadl:51:11
-    Identifiers List_Id 1000
-    1001 identifier thread_properties.aadl:51:24
-     Corresponding_Entity Node_Id 999
+   Expanded_Type_Designator Node_Id 1001
+   1001 enumeration type thread_properties.aadl:51:11
+    Identifiers List_Id 1002
+    1003 identifier thread_properties.aadl:51:24
+     Corresponding_Entity Node_Id 1001
      Display_Name Name_Id "flush"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1002 identifier thread_properties.aadl:51:31
-     Corresponding_Entity Node_Id 999
+    1004 identifier thread_properties.aadl:51:31
+     Corresponding_Entity Node_Id 1001
      Display_Name Name_Id "hold"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1014
-  1014 property value thread_properties.aadl:50:02
-   Value_Container Node_Id 822
-   Single_Value Node_Id 2543
-   2543 enumeration term thread_properties.aadl:51:37
-    Identifier Node_Id 1003
-    1003 identifier thread_properties.aadl:51:40
+  Default_Value Node_Id 1016
+  1016 property value thread_properties.aadl:50:02
+   Value_Container Node_Id 824
+   Single_Value Node_Id 2545
+   2545 enumeration term thread_properties.aadl:51:37
+    Identifier Node_Id 1005
+    1005 identifier thread_properties.aadl:51:40
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "flush"
      Scope_Entity Node_Id 0
@@ -4950,10 +4960,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2588
-   2588 enumeration term thread_properties.aadl:51:37
-    Identifier Node_Id 1003
-    1003 identifier thread_properties.aadl:51:40
+   Expanded_Single_Value Node_Id 2590
+   2590 enumeration term thread_properties.aadl:51:37
+    Identifier Node_Id 1005
+    1005 identifier thread_properties.aadl:51:40
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "flush"
      Scope_Entity Node_Id 0
@@ -4961,78 +4971,78 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1012
-  1012 applies to thread_properties.aadl:50:02
+  Applies_To Node_Id 1014
+  1014 applies to thread_properties.aadl:50:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1006
-   1007 named element thread_properties.aadl:52:15
+   Owner_Categories List_Id 1008
+   1009 named element thread_properties.aadl:52:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1008 named element thread_properties.aadl:52:23
+   1010 named element thread_properties.aadl:52:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1009 named element thread_properties.aadl:52:37
+   1011 named element thread_properties.aadl:52:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1010 named element thread_properties.aadl:52:46
+   1012 named element thread_properties.aadl:52:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 1028 property definition declaration thread_properties.aadl:54:02
-  Identifier Node_Id 1015
-  1015 identifier thread_properties.aadl:54:02
-   Corresponding_Entity Node_Id 1028
+ 1030 property definition declaration thread_properties.aadl:54:02
+  Identifier Node_Id 1017
+  1017 identifier thread_properties.aadl:54:02
+   Corresponding_Entity Node_Id 1030
    Display_Name Name_Id "Deactivation_Policy"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1030
-  1030 property type thread_properties.aadl:54:02
+  Property_Name_Type Node_Id 1032
+  1032 property type thread_properties.aadl:54:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1016
-   1016 enumeration type thread_properties.aadl:54:23
-    Identifiers List_Id 1017
-    1018 identifier thread_properties.aadl:54:36
-     Corresponding_Entity Node_Id 1016
+   Property_Type_Designator Node_Id 1018
+   1018 enumeration type thread_properties.aadl:54:23
+    Identifiers List_Id 1019
+    1020 identifier thread_properties.aadl:54:36
+     Corresponding_Entity Node_Id 1018
      Display_Name Name_Id "inactive"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1019 identifier thread_properties.aadl:54:46
-     Corresponding_Entity Node_Id 1016
+    1021 identifier thread_properties.aadl:54:46
+     Corresponding_Entity Node_Id 1018
      Display_Name Name_Id "unload"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1016
-   1016 enumeration type thread_properties.aadl:54:23
-    Identifiers List_Id 1017
-    1018 identifier thread_properties.aadl:54:36
-     Corresponding_Entity Node_Id 1016
+   Expanded_Type_Designator Node_Id 1018
+   1018 enumeration type thread_properties.aadl:54:23
+    Identifiers List_Id 1019
+    1020 identifier thread_properties.aadl:54:36
+     Corresponding_Entity Node_Id 1018
      Display_Name Name_Id "inactive"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1019 identifier thread_properties.aadl:54:46
-     Corresponding_Entity Node_Id 1016
+    1021 identifier thread_properties.aadl:54:46
+     Corresponding_Entity Node_Id 1018
      Display_Name Name_Id "unload"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1031
-  1031 property value thread_properties.aadl:54:02
-   Value_Container Node_Id 822
-   Single_Value Node_Id 2544
-   2544 enumeration term thread_properties.aadl:54:54
-    Identifier Node_Id 1020
-    1020 identifier thread_properties.aadl:54:57
+  Default_Value Node_Id 1033
+  1033 property value thread_properties.aadl:54:02
+   Value_Container Node_Id 824
+   Single_Value Node_Id 2546
+   2546 enumeration term thread_properties.aadl:54:54
+    Identifier Node_Id 1022
+    1022 identifier thread_properties.aadl:54:57
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "inactive"
      Scope_Entity Node_Id 0
@@ -5040,10 +5050,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2589
-   2589 enumeration term thread_properties.aadl:54:54
-    Identifier Node_Id 1020
-    1020 identifier thread_properties.aadl:54:57
+   Expanded_Single_Value Node_Id 2591
+   2591 enumeration term thread_properties.aadl:54:54
+    Identifier Node_Id 1022
+    1022 identifier thread_properties.aadl:54:57
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "inactive"
      Scope_Entity Node_Id 0
@@ -5051,115 +5061,115 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1029
-  1029 applies to thread_properties.aadl:54:02
+  Applies_To Node_Id 1031
+  1031 applies to thread_properties.aadl:54:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1023
-   1024 named element thread_properties.aadl:55:15
+   Owner_Categories List_Id 1025
+   1026 named element thread_properties.aadl:55:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1025 named element thread_properties.aadl:55:23
+   1027 named element thread_properties.aadl:55:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1026 named element thread_properties.aadl:55:32
+   1028 named element thread_properties.aadl:55:32
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   1027 named element thread_properties.aadl:55:51
+   1029 named element thread_properties.aadl:55:51
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 1039 property definition declaration thread_properties.aadl:57:02
-  Identifier Node_Id 1032
-  1032 identifier thread_properties.aadl:57:02
-   Corresponding_Entity Node_Id 1039
+ 1041 property definition declaration thread_properties.aadl:57:02
+  Identifier Node_Id 1034
+  1034 identifier thread_properties.aadl:57:02
+   Corresponding_Entity Node_Id 1041
    Display_Name Name_Id "Runtime_Protection"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1041
-  1041 property type thread_properties.aadl:57:02
+  Property_Name_Type Node_Id 1043
+  1043 property type thread_properties.aadl:57:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1033
-   1033 boolean type thread_properties.aadl:57:30
-   Expanded_Type_Designator Node_Id 1033
-   1033 boolean type thread_properties.aadl:57:30
+   Property_Type_Designator Node_Id 1035
+   1035 boolean type thread_properties.aadl:57:30
+   Expanded_Type_Designator Node_Id 1035
+   1035 boolean type thread_properties.aadl:57:30
   Default_Value Node_Id 0
-  Applies_To Node_Id 1040
-  1040 applies to thread_properties.aadl:57:02
+  Applies_To Node_Id 1042
+  1042 applies to thread_properties.aadl:57:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1035
-   1036 named element thread_properties.aadl:58:15
+   Owner_Categories List_Id 1037
+   1038 named element thread_properties.aadl:58:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1037 named element thread_properties.aadl:58:24
+   1039 named element thread_properties.aadl:58:24
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   1038 named element thread_properties.aadl:58:32
+   1040 named element thread_properties.aadl:58:32
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 1052 property definition declaration thread_properties.aadl:60:02
-  Identifier Node_Id 1042
-  1042 identifier thread_properties.aadl:60:02
-   Corresponding_Entity Node_Id 1052
+ 1054 property definition declaration thread_properties.aadl:60:02
+  Identifier Node_Id 1044
+  1044 identifier thread_properties.aadl:60:02
+   Corresponding_Entity Node_Id 1054
    Display_Name Name_Id "Subprogram_Call_Type"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1054
-  1054 property type thread_properties.aadl:60:02
+  Property_Name_Type Node_Id 1056
+  1056 property type thread_properties.aadl:60:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1043
-   1043 enumeration type thread_properties.aadl:60:24
-    Identifiers List_Id 1044
-    1045 identifier thread_properties.aadl:60:37
-     Corresponding_Entity Node_Id 1043
+   Property_Type_Designator Node_Id 1045
+   1045 enumeration type thread_properties.aadl:60:24
+    Identifiers List_Id 1046
+    1047 identifier thread_properties.aadl:60:37
+     Corresponding_Entity Node_Id 1045
      Display_Name Name_Id "Synchronous"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1046 identifier thread_properties.aadl:60:50
-     Corresponding_Entity Node_Id 1043
+    1048 identifier thread_properties.aadl:60:50
+     Corresponding_Entity Node_Id 1045
      Display_Name Name_Id "SemiSynchronous"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1043
-   1043 enumeration type thread_properties.aadl:60:24
-    Identifiers List_Id 1044
-    1045 identifier thread_properties.aadl:60:37
-     Corresponding_Entity Node_Id 1043
+   Expanded_Type_Designator Node_Id 1045
+   1045 enumeration type thread_properties.aadl:60:24
+    Identifiers List_Id 1046
+    1047 identifier thread_properties.aadl:60:37
+     Corresponding_Entity Node_Id 1045
      Display_Name Name_Id "Synchronous"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1046 identifier thread_properties.aadl:60:50
-     Corresponding_Entity Node_Id 1043
+    1048 identifier thread_properties.aadl:60:50
+     Corresponding_Entity Node_Id 1045
      Display_Name Name_Id "SemiSynchronous"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1055
-  1055 property value thread_properties.aadl:60:02
-   Value_Container Node_Id 822
-   Single_Value Node_Id 2545
-   2545 enumeration term thread_properties.aadl:61:03
-    Identifier Node_Id 1047
-    1047 identifier thread_properties.aadl:61:06
+  Default_Value Node_Id 1057
+  1057 property value thread_properties.aadl:60:02
+   Value_Container Node_Id 824
+   Single_Value Node_Id 2547
+   2547 enumeration term thread_properties.aadl:61:03
+    Identifier Node_Id 1049
+    1049 identifier thread_properties.aadl:61:06
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Synchronous"
      Scope_Entity Node_Id 0
@@ -5167,10 +5177,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2590
-   2590 enumeration term thread_properties.aadl:61:03
-    Identifier Node_Id 1047
-    1047 identifier thread_properties.aadl:61:06
+   Expanded_Single_Value Node_Id 2592
+   2592 enumeration term thread_properties.aadl:61:03
+    Identifier Node_Id 1049
+    1049 identifier thread_properties.aadl:61:06
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Synchronous"
      Scope_Entity Node_Id 0
@@ -5178,166 +5188,166 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1053
-  1053 applies to thread_properties.aadl:60:02
+  Applies_To Node_Id 1055
+  1055 applies to thread_properties.aadl:60:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1050
-   1051 named element thread_properties.aadl:62:15
+   Owner_Categories List_Id 1052
+   1053 named element thread_properties.aadl:62:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1065 property definition declaration thread_properties.aadl:64:02
-  Identifier Node_Id 1056
-  1056 identifier thread_properties.aadl:64:02
-   Corresponding_Entity Node_Id 1065
+ 1067 property definition declaration thread_properties.aadl:64:02
+  Identifier Node_Id 1058
+  1058 identifier thread_properties.aadl:64:02
+   Corresponding_Entity Node_Id 1067
    Display_Name Name_Id "Synchronized_Component"
-   Scope_Entity Node_Id 823
+   Scope_Entity Node_Id 825
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1067
-  1067 property type thread_properties.aadl:64:02
+  Property_Name_Type Node_Id 1069
+  1069 property type thread_properties.aadl:64:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1057
-   1057 boolean type thread_properties.aadl:64:34
-   Expanded_Type_Designator Node_Id 1057
-   1057 boolean type thread_properties.aadl:64:34
-  Default_Value Node_Id 1068
-  1068 property value thread_properties.aadl:64:02
-   Value_Container Node_Id 822
-   Single_Value Node_Id 1058
-   1058 literal thread_properties.aadl:64:49
+   Property_Type_Designator Node_Id 1059
+   1059 boolean type thread_properties.aadl:64:34
+   Expanded_Type_Designator Node_Id 1059
+   1059 boolean type thread_properties.aadl:64:34
+  Default_Value Node_Id 1070
+  1070 property value thread_properties.aadl:64:02
+   Value_Container Node_Id 824
+   Single_Value Node_Id 1060
+   1060 literal thread_properties.aadl:64:49
     Value Value_Id 36
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2591
-   2591 literal thread_properties.aadl:64:49
+   Expanded_Single_Value Node_Id 2593
+   2593 literal thread_properties.aadl:64:49
     Value Value_Id 67
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1066
-  1066 applies to thread_properties.aadl:64:02
+  Applies_To Node_Id 1068
+  1068 applies to thread_properties.aadl:64:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1060
-   1061 named element thread_properties.aadl:65:15
+   Owner_Categories List_Id 1062
+   1063 named element thread_properties.aadl:65:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1062 named element thread_properties.aadl:65:23
+   1064 named element thread_properties.aadl:65:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1063 named element thread_properties.aadl:65:37
+   1065 named element thread_properties.aadl:65:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1064 named element thread_properties.aadl:65:46
+   1066 named element thread_properties.aadl:65:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-1070 property set communication_properties.aadl:6:01
- Identifier Node_Id 1069
- 1069 identifier communication_properties.aadl:6:14
-  Corresponding_Entity Node_Id 1070
+1072 property set communication_properties.aadl:6:01
+ Identifier Node_Id 1071
+ 1071 identifier communication_properties.aadl:6:14
+  Corresponding_Entity Node_Id 1072
   Display_Name Name_Id "Communication_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 1071
- Declarations List_Id 1085
- 1082 property definition declaration communication_properties.aadl:7:02
-  Identifier Node_Id 1072
-  1072 identifier communication_properties.aadl:7:02
-   Corresponding_Entity Node_Id 1082
+ Entity_Scope Node_Id 1073
+ Declarations List_Id 1087
+ 1084 property definition declaration communication_properties.aadl:7:02
+  Identifier Node_Id 1074
+  1074 identifier communication_properties.aadl:7:02
+   Corresponding_Entity Node_Id 1084
    Display_Name Name_Id "Fan_Out_Policy"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1084
-  1084 property type communication_properties.aadl:7:02
+  Property_Name_Type Node_Id 1086
+  1086 property type communication_properties.aadl:7:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1073
-   1073 enumeration type communication_properties.aadl:7:18
-    Identifiers List_Id 1074
-    1075 identifier communication_properties.aadl:7:31
-     Corresponding_Entity Node_Id 1073
+   Property_Type_Designator Node_Id 1075
+   1075 enumeration type communication_properties.aadl:7:18
+    Identifiers List_Id 1076
+    1077 identifier communication_properties.aadl:7:31
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "Broadcast"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1076 identifier communication_properties.aadl:7:42
-     Corresponding_Entity Node_Id 1073
+    1078 identifier communication_properties.aadl:7:42
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "RoundRobin"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1077 identifier communication_properties.aadl:7:54
-     Corresponding_Entity Node_Id 1073
+    1079 identifier communication_properties.aadl:7:54
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "Selective"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1078 identifier communication_properties.aadl:7:65
-     Corresponding_Entity Node_Id 1073
+    1080 identifier communication_properties.aadl:7:65
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "OnDemand"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1073
-   1073 enumeration type communication_properties.aadl:7:18
-    Identifiers List_Id 1074
-    1075 identifier communication_properties.aadl:7:31
-     Corresponding_Entity Node_Id 1073
+   Expanded_Type_Designator Node_Id 1075
+   1075 enumeration type communication_properties.aadl:7:18
+    Identifiers List_Id 1076
+    1077 identifier communication_properties.aadl:7:31
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "Broadcast"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1076 identifier communication_properties.aadl:7:42
-     Corresponding_Entity Node_Id 1073
+    1078 identifier communication_properties.aadl:7:42
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "RoundRobin"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1077 identifier communication_properties.aadl:7:54
-     Corresponding_Entity Node_Id 1073
+    1079 identifier communication_properties.aadl:7:54
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "Selective"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1078 identifier communication_properties.aadl:7:65
-     Corresponding_Entity Node_Id 1073
+    1080 identifier communication_properties.aadl:7:65
+     Corresponding_Entity Node_Id 1075
      Display_Name Name_Id "OnDemand"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1083
-  1083 applies to communication_properties.aadl:7:02
+  Applies_To Node_Id 1085
+  1085 applies to communication_properties.aadl:7:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1080
-   1081 named element communication_properties.aadl:8:15
+   Owner_Categories List_Id 1082
+   1083 named element communication_properties.aadl:8:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1093 property definition declaration communication_properties.aadl:10:02
-  Identifier Node_Id 1086
-  1086 identifier communication_properties.aadl:10:02
-   Corresponding_Entity Node_Id 1093
+ 1095 property definition declaration communication_properties.aadl:10:02
+  Identifier Node_Id 1088
+  1088 identifier communication_properties.aadl:10:02
+   Corresponding_Entity Node_Id 1095
    Display_Name Name_Id "Connection_Pattern"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1095
-  1095 property type communication_properties.aadl:10:02
+  Property_Name_Type Node_Id 1097
+  1097 property type communication_properties.aadl:10:02
    Is_List Boolean TRUE
    Multiplicity Int 2
-   Property_Type_Designator Node_Id 1089
-   1089 unique property type identifier communication_properties.aadl:10:35
-    Identifier Node_Id 1088
-    1088 identifier communication_properties.aadl:10:38
+   Property_Type_Designator Node_Id 1091
+   1091 unique property type identifier communication_properties.aadl:10:35
+    Identifier Node_Id 1090
+    1090 identifier communication_properties.aadl:10:38
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Connection_Patterns"
      Scope_Entity Node_Id 0
@@ -5389,13 +5399,13 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1094
-  1094 applies to communication_properties.aadl:10:02
+  Applies_To Node_Id 1096
+  1096 applies to communication_properties.aadl:10:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1090
-   1091 named element communication_properties.aadl:11:15
-    Identifier Node_Id 1092
-    1092 identifier communication_properties.aadl:11:15
+   Owner_Categories List_Id 1092
+   1093 named element communication_properties.aadl:11:15
+    Identifier Node_Id 1094
+    1094 identifier communication_properties.aadl:11:15
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -5403,64 +5413,64 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1103 property definition declaration communication_properties.aadl:13:02
-  Identifier Node_Id 1096
-  1096 identifier communication_properties.aadl:13:02
-   Corresponding_Entity Node_Id 1103
+ 1105 property definition declaration communication_properties.aadl:13:02
+  Identifier Node_Id 1098
+  1098 identifier communication_properties.aadl:13:02
+   Corresponding_Entity Node_Id 1105
    Display_Name Name_Id "Connection_Set"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1105
-  1105 property type communication_properties.aadl:13:02
+  Property_Name_Type Node_Id 1107
+  1107 property type communication_properties.aadl:13:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 1099
-   1099 unique property type identifier communication_properties.aadl:13:23
-    Identifier Node_Id 1098
-    1098 identifier communication_properties.aadl:13:26
+   Property_Type_Designator Node_Id 1101
+   1101 unique property type identifier communication_properties.aadl:13:23
+    Identifier Node_Id 1100
+    1100 identifier communication_properties.aadl:13:26
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Connection_Pair"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1115
+    Entity Node_Id 1117
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1114
-   1114 record type communication_properties.aadl:16:31
-    List_Items List_Id 1107
-    1108 record type element communication_properties.aadl:17:03
-     Identifier Node_Id 1109
-     1109 identifier communication_properties.aadl:17:03
-      Corresponding_Entity Node_Id 1108
+   Expanded_Type_Designator Node_Id 1116
+   1116 record type communication_properties.aadl:16:31
+    List_Items List_Id 1109
+    1110 record type element communication_properties.aadl:17:03
+     Identifier Node_Id 1111
+     1111 identifier communication_properties.aadl:17:03
+      Corresponding_Entity Node_Id 1110
       Display_Name Name_Id "src"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean TRUE
-     Property_Type_Designator Node_Id 1110
-     1110 integer type communication_properties.aadl:17:16
+     Property_Type_Designator Node_Id 1112
+     1112 integer type communication_properties.aadl:17:16
       Type_Range Node_Id 0
       Unit_Designator Node_Id 0
-    1111 record type element communication_properties.aadl:18:03
-     Identifier Node_Id 1112
-     1112 identifier communication_properties.aadl:18:03
-      Corresponding_Entity Node_Id 1111
+    1113 record type element communication_properties.aadl:18:03
+     Identifier Node_Id 1114
+     1114 identifier communication_properties.aadl:18:03
+      Corresponding_Entity Node_Id 1113
       Display_Name Name_Id "dst"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean TRUE
-     Property_Type_Designator Node_Id 1113
-     1113 integer type communication_properties.aadl:18:16
+     Property_Type_Designator Node_Id 1115
+     1115 integer type communication_properties.aadl:18:16
       Type_Range Node_Id 0
       Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1104
-  1104 applies to communication_properties.aadl:13:02
+  Applies_To Node_Id 1106
+  1106 applies to communication_properties.aadl:13:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1100
-   1101 named element communication_properties.aadl:14:15
-    Identifier Node_Id 1102
-    1102 identifier communication_properties.aadl:14:15
+   Owner_Categories List_Id 1102
+   1103 named element communication_properties.aadl:14:15
+    Identifier Node_Id 1104
+    1104 identifier communication_properties.aadl:14:15
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -5468,147 +5478,147 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1115 property type declaration communication_properties.aadl:16:02
-  Identifier Node_Id 1106
-  1106 identifier communication_properties.aadl:16:02
-   Corresponding_Entity Node_Id 1115
+ 1117 property type declaration communication_properties.aadl:16:02
+  Identifier Node_Id 1108
+  1108 identifier communication_properties.aadl:16:02
+   Corresponding_Entity Node_Id 1117
    Display_Name Name_Id "Connection_Pair"
-   Scope_Entity Node_Id 1071
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1114
-  1114 record type communication_properties.aadl:16:31
-   List_Items List_Id 1107
-   1108 record type element communication_properties.aadl:17:03
-    Identifier Node_Id 1109
-    1109 identifier communication_properties.aadl:17:03
-     Corresponding_Entity Node_Id 1108
+   Scope_Entity Node_Id 1073
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1116
+  1116 record type communication_properties.aadl:16:31
+   List_Items List_Id 1109
+   1110 record type element communication_properties.aadl:17:03
+    Identifier Node_Id 1111
+    1111 identifier communication_properties.aadl:17:03
+     Corresponding_Entity Node_Id 1110
      Display_Name Name_Id "src"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean TRUE
-    Property_Type_Designator Node_Id 1110
-    1110 integer type communication_properties.aadl:17:16
+    Property_Type_Designator Node_Id 1112
+    1112 integer type communication_properties.aadl:17:16
      Type_Range Node_Id 0
      Unit_Designator Node_Id 0
-   1111 record type element communication_properties.aadl:18:03
-    Identifier Node_Id 1112
-    1112 identifier communication_properties.aadl:18:03
-     Corresponding_Entity Node_Id 1111
+   1113 record type element communication_properties.aadl:18:03
+    Identifier Node_Id 1114
+    1114 identifier communication_properties.aadl:18:03
+     Corresponding_Entity Node_Id 1113
      Display_Name Name_Id "dst"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean TRUE
-    Property_Type_Designator Node_Id 1113
-    1113 integer type communication_properties.aadl:18:16
+    Property_Type_Designator Node_Id 1115
+    1115 integer type communication_properties.aadl:18:16
      Type_Range Node_Id 0
      Unit_Designator Node_Id 0
- 1123 property definition declaration communication_properties.aadl:20:04
-  Identifier Node_Id 1116
-  1116 identifier communication_properties.aadl:20:04
-   Corresponding_Entity Node_Id 1123
+ 1125 property definition declaration communication_properties.aadl:20:04
+  Identifier Node_Id 1118
+  1118 identifier communication_properties.aadl:20:04
+   Corresponding_Entity Node_Id 1125
    Display_Name Name_Id "Data_Rate"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1125
-  1125 property type communication_properties.aadl:20:04
+  Property_Name_Type Node_Id 1127
+  1127 property type communication_properties.aadl:20:04
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1117
-   1117 integer type communication_properties.aadl:20:16
+   Property_Type_Designator Node_Id 1119
+   1119 integer type communication_properties.aadl:20:16
     Type_Range Node_Id 0
-    Unit_Designator Node_Id 1119
-    1119 unique property type identifier communication_properties.aadl:20:28
-     Identifier Node_Id 1118
-     1118 identifier communication_properties.aadl:20:34
+    Unit_Designator Node_Id 1121
+    1121 unique property type identifier communication_properties.aadl:20:28
+     Identifier Node_Id 1120
+     1120 identifier communication_properties.aadl:20:34
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Data_Rate_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 315
+     Entity Node_Id 317
      Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2592
-   2592 integer type communication_properties.aadl:20:16
+   Expanded_Type_Designator Node_Id 2594
+   2594 integer type communication_properties.aadl:20:16
     Type_Range Node_Id 0
-    Unit_Designator Node_Id 1119
-    1119 unique property type identifier communication_properties.aadl:20:28
-     Identifier Node_Id 1118
-     1118 identifier communication_properties.aadl:20:34
+    Unit_Designator Node_Id 1121
+    1121 unique property type identifier communication_properties.aadl:20:28
+     Identifier Node_Id 1120
+     1120 identifier communication_properties.aadl:20:34
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Data_Rate_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 315
+     Entity Node_Id 317
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1124
-  1124 applies to communication_properties.aadl:20:04
+  Applies_To Node_Id 1126
+  1126 applies to communication_properties.aadl:20:04
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1121
-   1122 named element communication_properties.aadl:20:62
+   Owner_Categories List_Id 1123
+   1124 named element communication_properties.aadl:20:62
     Identifier Node_Id 0
     Category Byte 31
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1139 property definition declaration communication_properties.aadl:22:02
-  Identifier Node_Id 1126
-  1126 identifier communication_properties.aadl:22:02
-   Corresponding_Entity Node_Id 1139
+ 1141 property definition declaration communication_properties.aadl:22:02
+  Identifier Node_Id 1128
+  1128 identifier communication_properties.aadl:22:02
+   Corresponding_Entity Node_Id 1141
    Display_Name Name_Id "Overflow_Handling_Protocol"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1141
-  1141 property type communication_properties.aadl:22:02
+  Property_Name_Type Node_Id 1143
+  1143 property type communication_properties.aadl:22:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1127
-   1127 enumeration type communication_properties.aadl:22:30
-    Identifiers List_Id 1128
-    1129 identifier communication_properties.aadl:22:43
-     Corresponding_Entity Node_Id 1127
+   Property_Type_Designator Node_Id 1129
+   1129 enumeration type communication_properties.aadl:22:30
+    Identifiers List_Id 1130
+    1131 identifier communication_properties.aadl:22:43
+     Corresponding_Entity Node_Id 1129
      Display_Name Name_Id "DropOldest"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1130 identifier communication_properties.aadl:22:55
-     Corresponding_Entity Node_Id 1127
+    1132 identifier communication_properties.aadl:22:55
+     Corresponding_Entity Node_Id 1129
      Display_Name Name_Id "DropNewest"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1131 identifier communication_properties.aadl:22:67
-     Corresponding_Entity Node_Id 1127
+    1133 identifier communication_properties.aadl:22:67
+     Corresponding_Entity Node_Id 1129
      Display_Name Name_Id "Error"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1127
-   1127 enumeration type communication_properties.aadl:22:30
-    Identifiers List_Id 1128
-    1129 identifier communication_properties.aadl:22:43
-     Corresponding_Entity Node_Id 1127
+   Expanded_Type_Designator Node_Id 1129
+   1129 enumeration type communication_properties.aadl:22:30
+    Identifiers List_Id 1130
+    1131 identifier communication_properties.aadl:22:43
+     Corresponding_Entity Node_Id 1129
      Display_Name Name_Id "DropOldest"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1130 identifier communication_properties.aadl:22:55
-     Corresponding_Entity Node_Id 1127
+    1132 identifier communication_properties.aadl:22:55
+     Corresponding_Entity Node_Id 1129
      Display_Name Name_Id "DropNewest"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1131 identifier communication_properties.aadl:22:67
-     Corresponding_Entity Node_Id 1127
+    1133 identifier communication_properties.aadl:22:67
+     Corresponding_Entity Node_Id 1129
      Display_Name Name_Id "Error"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1142
-  1142 property value communication_properties.aadl:22:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 2546
-   2546 enumeration term communication_properties.aadl:22:74
-    Identifier Node_Id 1132
-    1132 identifier communication_properties.aadl:22:77
+  Default_Value Node_Id 1144
+  1144 property value communication_properties.aadl:22:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 2548
+   2548 enumeration term communication_properties.aadl:22:74
+    Identifier Node_Id 1134
+    1134 identifier communication_properties.aadl:22:77
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "DropOldest"
      Scope_Entity Node_Id 0
@@ -5616,10 +5626,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2593
-   2593 enumeration term communication_properties.aadl:22:74
-    Identifier Node_Id 1132
-    1132 identifier communication_properties.aadl:22:77
+   Expanded_Single_Value Node_Id 2595
+   2595 enumeration term communication_properties.aadl:22:74
+    Identifier Node_Id 1134
+    1134 identifier communication_properties.aadl:22:77
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "DropOldest"
      Scope_Entity Node_Id 0
@@ -5627,42 +5637,42 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1140
-  1140 applies to communication_properties.aadl:22:02
+  Applies_To Node_Id 1142
+  1142 applies to communication_properties.aadl:22:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1135
-   1136 named element communication_properties.aadl:23:15
+   Owner_Categories List_Id 1137
+   1138 named element communication_properties.aadl:23:15
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1137 named element communication_properties.aadl:23:27
+   1139 named element communication_properties.aadl:23:27
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1138 named element communication_properties.aadl:23:44
+   1140 named element communication_properties.aadl:23:44
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1153 property definition declaration communication_properties.aadl:25:02
-  Identifier Node_Id 1143
-  1143 identifier communication_properties.aadl:25:02
-   Corresponding_Entity Node_Id 1153
+ 1155 property definition declaration communication_properties.aadl:25:02
+  Identifier Node_Id 1145
+  1145 identifier communication_properties.aadl:25:02
+   Corresponding_Entity Node_Id 1155
    Display_Name Name_Id "Queue_Processing_Protocol"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1155
-  1155 property type communication_properties.aadl:25:02
+  Property_Name_Type Node_Id 1157
+  1157 property type communication_properties.aadl:25:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1145
-   1145 unique property type identifier communication_properties.aadl:25:27
-    Identifier Node_Id 1144
-    1144 identifier communication_properties.aadl:25:29
+   Property_Type_Designator Node_Id 1147
+   1147 unique property type identifier communication_properties.aadl:25:27
+    Identifier Node_Id 1146
+    1146 identifier communication_properties.aadl:25:29
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Queue_Processing_Protocols"
      Scope_Entity Node_Id 0
@@ -5678,13 +5688,13 @@ Declarations List_Id 7
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1156
-  1156 property value communication_properties.aadl:25:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 2547
-   2547 enumeration term communication_properties.aadl:25:66
-    Identifier Node_Id 1146
-    1146 identifier communication_properties.aadl:25:69
+  Default_Value Node_Id 1158
+  1158 property value communication_properties.aadl:25:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 2549
+   2549 enumeration term communication_properties.aadl:25:66
+    Identifier Node_Id 1148
+    1148 identifier communication_properties.aadl:25:69
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "FIFO"
      Scope_Entity Node_Id 0
@@ -5692,10 +5702,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2594
-   2594 enumeration term communication_properties.aadl:25:66
-    Identifier Node_Id 1146
-    1146 identifier communication_properties.aadl:25:69
+   Expanded_Single_Value Node_Id 2596
+   2596 enumeration term communication_properties.aadl:25:66
+    Identifier Node_Id 1148
+    1148 identifier communication_properties.aadl:25:69
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "FIFO"
      Scope_Entity Node_Id 0
@@ -5703,207 +5713,207 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1154
-  1154 applies to communication_properties.aadl:25:02
+  Applies_To Node_Id 1156
+  1156 applies to communication_properties.aadl:25:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1149
-   1150 named element communication_properties.aadl:26:15
+   Owner_Categories List_Id 1151
+   1152 named element communication_properties.aadl:26:15
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1151 named element communication_properties.aadl:26:27
+   1153 named element communication_properties.aadl:26:27
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1152 named element communication_properties.aadl:26:44
+   1154 named element communication_properties.aadl:26:44
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1171 property definition declaration communication_properties.aadl:28:02
-  Identifier Node_Id 1157
-  1157 identifier communication_properties.aadl:28:02
-   Corresponding_Entity Node_Id 1171
+ 1173 property definition declaration communication_properties.aadl:28:02
+  Identifier Node_Id 1159
+  1159 identifier communication_properties.aadl:28:02
+   Corresponding_Entity Node_Id 1173
    Display_Name Name_Id "Queue_Size"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1173
-  1173 property type communication_properties.aadl:28:02
+  Property_Name_Type Node_Id 1175
+  1175 property type communication_properties.aadl:28:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1158
-   1158 integer type communication_properties.aadl:28:14
-    Type_Range Node_Id 1163
-    1163 number range communication_properties.aadl:28:26
-     Lower_Bound Node_Id 1159
-     1159 signed aadlnumber communication_properties.aadl:28:26
-      Number_Value Node_Id 1160
-      1160 literal communication_properties.aadl:28:26
+   Property_Type_Designator Node_Id 1160
+   1160 integer type communication_properties.aadl:28:14
+    Type_Range Node_Id 1165
+    1165 number range communication_properties.aadl:28:26
+     Lower_Bound Node_Id 1161
+     1161 signed aadlnumber communication_properties.aadl:28:26
+      Number_Value Node_Id 1162
+      1162 literal communication_properties.aadl:28:26
        Value Value_Id 37
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 1162
-     1162 property term communication_properties.aadl:28:28
-      Identifier Node_Id 1161
-      1161 identifier communication_properties.aadl:28:31
+     Upper_Bound Node_Id 1164
+     1164 property term communication_properties.aadl:28:28
+      Identifier Node_Id 1163
+      1163 identifier communication_properties.aadl:28:31
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Max_Queue_Size"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 186
+      Entity Node_Id 188
       Property_Set_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2595
-   2595 integer type communication_properties.aadl:28:14
-    Type_Range Node_Id 2596
-    2596 number range communication_properties.aadl:28:26
-     Lower_Bound Node_Id 2597
-     2597 signed aadlnumber communication_properties.aadl:28:26
-      Number_Value Node_Id 2598
-      2598 literal communication_properties.aadl:28:26
+   Expanded_Type_Designator Node_Id 2597
+   2597 integer type communication_properties.aadl:28:14
+    Type_Range Node_Id 2598
+    2598 number range communication_properties.aadl:28:26
+     Lower_Bound Node_Id 2599
+     2599 signed aadlnumber communication_properties.aadl:28:26
+      Number_Value Node_Id 2600
+      2600 literal communication_properties.aadl:28:26
        Value Value_Id 68
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 2599
-     2599 signed aadlnumber aadl_project.aadl:101:43
-      Number_Value Node_Id 2600
-      2600 literal aadl_project.aadl:101:43
+     Upper_Bound Node_Id 2601
+     2601 signed aadlnumber aadl_project.aadl:103:43
+      Number_Value Node_Id 2602
+      2602 literal aadl_project.aadl:103:43
        Value Value_Id 69
       Unit_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-  Default_Value Node_Id 1174
-  1174 property value communication_properties.aadl:28:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 1164
-   1164 signed aadlnumber communication_properties.aadl:28:49
-    Number_Value Node_Id 1165
-    1165 literal communication_properties.aadl:28:49
+  Default_Value Node_Id 1176
+  1176 property value communication_properties.aadl:28:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 1166
+   1166 signed aadlnumber communication_properties.aadl:28:49
+    Number_Value Node_Id 1167
+    1167 literal communication_properties.aadl:28:49
      Value Value_Id 38
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2601
-   2601 signed aadlnumber communication_properties.aadl:28:49
-    Number_Value Node_Id 2602
-    2602 literal communication_properties.aadl:28:49
+   Expanded_Single_Value Node_Id 2603
+   2603 signed aadlnumber communication_properties.aadl:28:49
+    Number_Value Node_Id 2604
+    2604 literal communication_properties.aadl:28:49
      Value Value_Id 70
     Unit_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1172
-  1172 applies to communication_properties.aadl:28:02
+  Applies_To Node_Id 1174
+  1174 applies to communication_properties.aadl:28:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1167
-   1168 named element communication_properties.aadl:29:15
+   Owner_Categories List_Id 1169
+   1170 named element communication_properties.aadl:29:15
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1169 named element communication_properties.aadl:29:27
+   1171 named element communication_properties.aadl:29:27
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1170 named element communication_properties.aadl:29:44
+   1172 named element communication_properties.aadl:29:44
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1181 property definition declaration communication_properties.aadl:31:02
-  Identifier Node_Id 1175
-  1175 identifier communication_properties.aadl:31:02
-   Corresponding_Entity Node_Id 1181
+ 1183 property definition declaration communication_properties.aadl:31:02
+  Identifier Node_Id 1177
+  1177 identifier communication_properties.aadl:31:02
+   Corresponding_Entity Node_Id 1183
    Display_Name Name_Id "Required_Connection"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1183
-  1183 property type communication_properties.aadl:31:02
+  Property_Name_Type Node_Id 1185
+  1185 property type communication_properties.aadl:31:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1176
-   1176 boolean type communication_properties.aadl:31:23
-   Expanded_Type_Designator Node_Id 1176
-   1176 boolean type communication_properties.aadl:31:23
-  Default_Value Node_Id 1184
-  1184 property value communication_properties.aadl:31:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 1177
-   1177 literal communication_properties.aadl:31:38
+   Property_Type_Designator Node_Id 1178
+   1178 boolean type communication_properties.aadl:31:23
+   Expanded_Type_Designator Node_Id 1178
+   1178 boolean type communication_properties.aadl:31:23
+  Default_Value Node_Id 1186
+  1186 property value communication_properties.aadl:31:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 1179
+   1179 literal communication_properties.aadl:31:38
     Value Value_Id 39
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2603
-   2603 literal communication_properties.aadl:31:38
+   Expanded_Single_Value Node_Id 2605
+   2605 literal communication_properties.aadl:31:38
     Value Value_Id 71
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1182
-  1182 applies to communication_properties.aadl:31:02
+  Applies_To Node_Id 1184
+  1184 applies to communication_properties.aadl:31:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1179
-   1180 named element communication_properties.aadl:32:15
+   Owner_Categories List_Id 1181
+   1182 named element communication_properties.aadl:32:15
     Identifier Node_Id 0
     Category Byte 31
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1196 property definition declaration communication_properties.aadl:34:02
-  Identifier Node_Id 1185
-  1185 identifier communication_properties.aadl:34:02
-   Corresponding_Entity Node_Id 1196
+ 1198 property definition declaration communication_properties.aadl:34:02
+  Identifier Node_Id 1187
+  1187 identifier communication_properties.aadl:34:02
+   Corresponding_Entity Node_Id 1198
    Display_Name Name_Id "Timing"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1198
-  1198 property type communication_properties.aadl:34:02
+  Property_Name_Type Node_Id 1200
+  1200 property type communication_properties.aadl:34:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1186
-   1186 enumeration type communication_properties.aadl:34:10
-    Identifiers List_Id 1187
-    1188 identifier communication_properties.aadl:34:23
-     Corresponding_Entity Node_Id 1186
+   Property_Type_Designator Node_Id 1188
+   1188 enumeration type communication_properties.aadl:34:10
+    Identifiers List_Id 1189
+    1190 identifier communication_properties.aadl:34:23
+     Corresponding_Entity Node_Id 1188
      Display_Name Name_Id "sampled"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1189 identifier communication_properties.aadl:34:32
-     Corresponding_Entity Node_Id 1186
+    1191 identifier communication_properties.aadl:34:32
+     Corresponding_Entity Node_Id 1188
      Display_Name Name_Id "immediate"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1190 identifier communication_properties.aadl:34:43
-     Corresponding_Entity Node_Id 1186
+    1192 identifier communication_properties.aadl:34:43
+     Corresponding_Entity Node_Id 1188
      Display_Name Name_Id "delayed"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1186
-   1186 enumeration type communication_properties.aadl:34:10
-    Identifiers List_Id 1187
-    1188 identifier communication_properties.aadl:34:23
-     Corresponding_Entity Node_Id 1186
+   Expanded_Type_Designator Node_Id 1188
+   1188 enumeration type communication_properties.aadl:34:10
+    Identifiers List_Id 1189
+    1190 identifier communication_properties.aadl:34:23
+     Corresponding_Entity Node_Id 1188
      Display_Name Name_Id "sampled"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1189 identifier communication_properties.aadl:34:32
-     Corresponding_Entity Node_Id 1186
+    1191 identifier communication_properties.aadl:34:32
+     Corresponding_Entity Node_Id 1188
      Display_Name Name_Id "immediate"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1190 identifier communication_properties.aadl:34:43
-     Corresponding_Entity Node_Id 1186
+    1192 identifier communication_properties.aadl:34:43
+     Corresponding_Entity Node_Id 1188
      Display_Name Name_Id "delayed"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1199
-  1199 property value communication_properties.aadl:34:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 2548
-   2548 enumeration term communication_properties.aadl:34:52
-    Identifier Node_Id 1191
-    1191 identifier communication_properties.aadl:34:55
+  Default_Value Node_Id 1201
+  1201 property value communication_properties.aadl:34:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 2550
+   2550 enumeration term communication_properties.aadl:34:52
+    Identifier Node_Id 1193
+    1193 identifier communication_properties.aadl:34:55
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "sampled"
      Scope_Entity Node_Id 0
@@ -5911,10 +5921,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2604
-   2604 enumeration term communication_properties.aadl:34:52
-    Identifier Node_Id 1191
-    1191 identifier communication_properties.aadl:34:55
+   Expanded_Single_Value Node_Id 2606
+   2606 enumeration term communication_properties.aadl:34:52
+    Identifier Node_Id 1193
+    1193 identifier communication_properties.aadl:34:55
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "sampled"
      Scope_Entity Node_Id 0
@@ -5922,1326 +5932,1326 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1197
-  1197 applies to communication_properties.aadl:34:02
+  Applies_To Node_Id 1199
+  1199 applies to communication_properties.aadl:34:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1194
-   1195 named element communication_properties.aadl:35:15
+   Owner_Categories List_Id 1196
+   1197 named element communication_properties.aadl:35:15
     Identifier Node_Id 0
     Category Byte 48
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1211 property definition declaration communication_properties.aadl:37:02
-  Identifier Node_Id 1200
-  1200 identifier communication_properties.aadl:37:02
-   Corresponding_Entity Node_Id 1211
+ 1213 property definition declaration communication_properties.aadl:37:02
+  Identifier Node_Id 1202
+  1202 identifier communication_properties.aadl:37:02
+   Corresponding_Entity Node_Id 1213
    Display_Name Name_Id "Transmission_Type"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1213
-  1213 property type communication_properties.aadl:37:02
+  Property_Name_Type Node_Id 1215
+  1215 property type communication_properties.aadl:37:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1201
-   1201 enumeration type communication_properties.aadl:37:21
-    Identifiers List_Id 1202
-    1203 identifier communication_properties.aadl:37:34
-     Corresponding_Entity Node_Id 1201
+   Property_Type_Designator Node_Id 1203
+   1203 enumeration type communication_properties.aadl:37:21
+    Identifiers List_Id 1204
+    1205 identifier communication_properties.aadl:37:34
+     Corresponding_Entity Node_Id 1203
      Display_Name Name_Id "push"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1204 identifier communication_properties.aadl:37:40
-     Corresponding_Entity Node_Id 1201
+    1206 identifier communication_properties.aadl:37:40
+     Corresponding_Entity Node_Id 1203
      Display_Name Name_Id "pull"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1201
-   1201 enumeration type communication_properties.aadl:37:21
-    Identifiers List_Id 1202
-    1203 identifier communication_properties.aadl:37:34
-     Corresponding_Entity Node_Id 1201
+   Expanded_Type_Designator Node_Id 1203
+   1203 enumeration type communication_properties.aadl:37:21
+    Identifiers List_Id 1204
+    1205 identifier communication_properties.aadl:37:34
+     Corresponding_Entity Node_Id 1203
      Display_Name Name_Id "push"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1204 identifier communication_properties.aadl:37:40
-     Corresponding_Entity Node_Id 1201
+    1206 identifier communication_properties.aadl:37:40
+     Corresponding_Entity Node_Id 1203
      Display_Name Name_Id "pull"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1212
-  1212 applies to communication_properties.aadl:37:02
+  Applies_To Node_Id 1214
+  1214 applies to communication_properties.aadl:37:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1206
-   1207 named element communication_properties.aadl:38:15
+   Owner_Categories List_Id 1208
+   1209 named element communication_properties.aadl:38:15
     Identifier Node_Id 0
     Category Byte 16
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1208 named element communication_properties.aadl:38:26
+   1210 named element communication_properties.aadl:38:26
     Identifier Node_Id 0
     Category Byte 48
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1209 named element communication_properties.aadl:38:43
+   1211 named element communication_properties.aadl:38:43
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   1210 named element communication_properties.aadl:38:48
+   1212 named element communication_properties.aadl:38:48
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
- 1237 property definition declaration communication_properties.aadl:41:02
-  Identifier Node_Id 1214
-  1214 identifier communication_properties.aadl:41:02
-   Corresponding_Entity Node_Id 1237
+ 1239 property definition declaration communication_properties.aadl:41:02
+  Identifier Node_Id 1216
+  1216 identifier communication_properties.aadl:41:02
+   Corresponding_Entity Node_Id 1239
    Display_Name Name_Id "Input_Rate"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1239
-  1239 property type communication_properties.aadl:41:02
+  Property_Name_Type Node_Id 1241
+  1241 property type communication_properties.aadl:41:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1216
-   1216 unique property type identifier communication_properties.aadl:41:12
-    Identifier Node_Id 1215
-    1215 identifier communication_properties.aadl:41:14
+   Property_Type_Designator Node_Id 1218
+   1218 unique property type identifier communication_properties.aadl:41:12
+    Identifier Node_Id 1217
+    1217 identifier communication_properties.aadl:41:14
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Rate_Spec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1358
+    Entity Node_Id 1360
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1357
-   1357 record type communication_properties.aadl:60:25
-    List_Items List_Id 1342
-    1343 record type element communication_properties.aadl:61:03
-     Identifier Node_Id 1344
-     1344 identifier communication_properties.aadl:61:03
-      Corresponding_Entity Node_Id 1343
+   Expanded_Type_Designator Node_Id 1359
+   1359 record type communication_properties.aadl:60:25
+    List_Items List_Id 1344
+    1345 record type element communication_properties.aadl:61:03
+     Identifier Node_Id 1346
+     1346 identifier communication_properties.aadl:61:03
+      Corresponding_Entity Node_Id 1345
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1345
-     1345 range type communication_properties.aadl:61:16
-      Number_Type Node_Id 1346
-      1346 real type communication_properties.aadl:61:25
+     Property_Type_Designator Node_Id 1347
+     1347 range type communication_properties.aadl:61:16
+      Number_Type Node_Id 1348
+      1348 real type communication_properties.aadl:61:25
        Type_Range Node_Id 0
        Unit_Designator Node_Id 0
-    1347 record type element communication_properties.aadl:62:03
-     Identifier Node_Id 1348
-     1348 identifier communication_properties.aadl:62:03
-      Corresponding_Entity Node_Id 1347
+    1349 record type element communication_properties.aadl:62:03
+     Identifier Node_Id 1350
+     1350 identifier communication_properties.aadl:62:03
+      Corresponding_Entity Node_Id 1349
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1349
-     1349 enumeration type communication_properties.aadl:62:14
-      Identifiers List_Id 1350
-      1351 identifier communication_properties.aadl:62:27
-       Corresponding_Entity Node_Id 1349
+     Property_Type_Designator Node_Id 1351
+     1351 enumeration type communication_properties.aadl:62:14
+      Identifiers List_Id 1352
+      1353 identifier communication_properties.aadl:62:27
+       Corresponding_Entity Node_Id 1351
        Display_Name Name_Id "PerSecond"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      1352 identifier communication_properties.aadl:62:38
-       Corresponding_Entity Node_Id 1349
+      1354 identifier communication_properties.aadl:62:38
+       Corresponding_Entity Node_Id 1351
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Enumeration_Context Node_Id 0
-    1353 record type element communication_properties.aadl:63:03
-     Identifier Node_Id 1354
-     1354 identifier communication_properties.aadl:63:03
-      Corresponding_Entity Node_Id 1353
+    1355 record type element communication_properties.aadl:63:03
+     Identifier Node_Id 1356
+     1356 identifier communication_properties.aadl:63:03
+      Corresponding_Entity Node_Id 1355
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1356
-     1356 unique property type identifier communication_properties.aadl:63:20
-      Identifier Node_Id 1355
-      1355 identifier communication_properties.aadl:63:22
+     Property_Type_Designator Node_Id 1358
+     1358 unique property type identifier communication_properties.aadl:63:20
+      Identifier Node_Id 1357
+      1357 identifier communication_properties.aadl:63:22
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Supported_Distributions"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Entity Node_Id 0
       Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1240
-  1240 property value communication_properties.aadl:41:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 1217
-   1217 record term communication_properties.aadl:41:27
-    List_Items List_Id 1218
-    1219 record term element communication_properties.aadl:41:29
-     Identifier Node_Id 1220
-     1220 identifier communication_properties.aadl:41:29
-      Corresponding_Entity Node_Id 1219
+  Default_Value Node_Id 1242
+  1242 property value communication_properties.aadl:41:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 1219
+   1219 record term communication_properties.aadl:41:27
+    List_Items List_Id 1220
+    1221 record term element communication_properties.aadl:41:29
+     Identifier Node_Id 1222
+     1222 identifier communication_properties.aadl:41:29
+      Corresponding_Entity Node_Id 1221
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1225
-     1225 number range term communication_properties.aadl:41:44
-      Lower_Bound Node_Id 1221
-      1221 signed aadlnumber communication_properties.aadl:41:44
-       Number_Value Node_Id 1222
-       1222 literal communication_properties.aadl:41:44
+     Property_Expression Node_Id 1227
+     1227 number range term communication_properties.aadl:41:44
+      Lower_Bound Node_Id 1223
+      1223 signed aadlnumber communication_properties.aadl:41:44
+       Number_Value Node_Id 1224
+       1224 literal communication_properties.aadl:41:44
         Value Value_Id 40
        Unit_Identifier Node_Id 0
-      Upper_Bound Node_Id 1223
-      1223 signed aadlnumber communication_properties.aadl:41:51
-       Number_Value Node_Id 1224
-       1224 literal communication_properties.aadl:41:51
+      Upper_Bound Node_Id 1225
+      1225 signed aadlnumber communication_properties.aadl:41:51
+       Number_Value Node_Id 1226
+       1226 literal communication_properties.aadl:41:51
         Value Value_Id 41
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    1226 record term element communication_properties.aadl:41:56
-     Identifier Node_Id 1227
-     1227 identifier communication_properties.aadl:41:56
-      Corresponding_Entity Node_Id 1226
+    1228 record term element communication_properties.aadl:41:56
+     Identifier Node_Id 1229
+     1229 identifier communication_properties.aadl:41:56
+      Corresponding_Entity Node_Id 1228
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1229
-     1229 property term communication_properties.aadl:41:66
-      Identifier Node_Id 1228
-      1228 identifier communication_properties.aadl:41:69
+     Property_Expression Node_Id 1231
+     1231 property term communication_properties.aadl:41:66
+      Identifier Node_Id 1230
+      1230 identifier communication_properties.aadl:41:69
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1358
+      Entity Node_Id 1360
       Property_Set_Identifier Node_Id 0
-    1230 record term element communication_properties.aadl:41:82
-     Identifier Node_Id 1231
-     1231 identifier communication_properties.aadl:41:82
-      Corresponding_Entity Node_Id 1230
+    1232 record term element communication_properties.aadl:41:82
+     Identifier Node_Id 1233
+     1233 identifier communication_properties.aadl:41:82
+      Corresponding_Entity Node_Id 1232
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1233
-     1233 property term communication_properties.aadl:41:100
-      Identifier Node_Id 1232
-      1232 identifier communication_properties.aadl:41:103
+     Property_Expression Node_Id 1235
+     1235 property term communication_properties.aadl:41:100
+      Identifier Node_Id 1234
+      1234 identifier communication_properties.aadl:41:103
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Fixed"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1358
+      Entity Node_Id 1360
       Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2605
-   2605 record term communication_properties.aadl:41:27
-    List_Items List_Id 2606
-    2607 record term element communication_properties.aadl:41:27
-     Identifier Node_Id 1220
-     1220 identifier communication_properties.aadl:41:29
-      Corresponding_Entity Node_Id 1219
+   Expanded_Single_Value Node_Id 2607
+   2607 record term communication_properties.aadl:41:27
+    List_Items List_Id 2608
+    2609 record term element communication_properties.aadl:41:27
+     Identifier Node_Id 1222
+     1222 identifier communication_properties.aadl:41:29
+      Corresponding_Entity Node_Id 1221
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2608
-     2608 number range term communication_properties.aadl:41:44
-      Lower_Bound Node_Id 2609
-      2609 signed aadlnumber communication_properties.aadl:41:44
-       Number_Value Node_Id 2610
-       2610 literal communication_properties.aadl:41:44
+     Property_Expression Node_Id 2610
+     2610 number range term communication_properties.aadl:41:44
+      Lower_Bound Node_Id 2611
+      2611 signed aadlnumber communication_properties.aadl:41:44
+       Number_Value Node_Id 2612
+       2612 literal communication_properties.aadl:41:44
         Value Value_Id 72
        Unit_Identifier Node_Id 0
-      Upper_Bound Node_Id 2611
-      2611 signed aadlnumber communication_properties.aadl:41:51
-       Number_Value Node_Id 2612
-       2612 literal communication_properties.aadl:41:51
+      Upper_Bound Node_Id 2613
+      2613 signed aadlnumber communication_properties.aadl:41:51
+       Number_Value Node_Id 2614
+       2614 literal communication_properties.aadl:41:51
         Value Value_Id 73
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    2613 record term element communication_properties.aadl:41:27
-     Identifier Node_Id 1227
-     1227 identifier communication_properties.aadl:41:56
-      Corresponding_Entity Node_Id 1226
+    2615 record term element communication_properties.aadl:41:27
+     Identifier Node_Id 1229
+     1229 identifier communication_properties.aadl:41:56
+      Corresponding_Entity Node_Id 1228
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
-    2614 record term element communication_properties.aadl:41:27
-     Identifier Node_Id 1231
-     1231 identifier communication_properties.aadl:41:82
-      Corresponding_Entity Node_Id 1230
+    2616 record term element communication_properties.aadl:41:27
+     Identifier Node_Id 1233
+     1233 identifier communication_properties.aadl:41:82
+      Corresponding_Entity Node_Id 1232
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1238
-  1238 applies to communication_properties.aadl:41:02
+  Applies_To Node_Id 1240
+  1240 applies to communication_properties.aadl:41:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1235
-   1236 named element communication_properties.aadl:42:15
+   Owner_Categories List_Id 1237
+   1238 named element communication_properties.aadl:42:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1263 property definition declaration communication_properties.aadl:44:02
-  Identifier Node_Id 1241
-  1241 identifier communication_properties.aadl:44:02
-   Corresponding_Entity Node_Id 1263
+ 1265 property definition declaration communication_properties.aadl:44:02
+  Identifier Node_Id 1243
+  1243 identifier communication_properties.aadl:44:02
+   Corresponding_Entity Node_Id 1265
    Display_Name Name_Id "Input_Time"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1265
-  1265 property type communication_properties.aadl:44:02
+  Property_Name_Type Node_Id 1267
+  1267 property type communication_properties.aadl:44:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 1244
-   1244 unique property type identifier communication_properties.aadl:44:19
-    Identifier Node_Id 1243
-    1243 identifier communication_properties.aadl:44:22
+   Property_Type_Designator Node_Id 1246
+   1246 unique property type identifier communication_properties.aadl:44:19
+    Identifier Node_Id 1245
+    1245 identifier communication_properties.aadl:44:22
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "IO_Time_Spec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1278
+    Entity Node_Id 1280
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1277
-   1277 record type communication_properties.aadl:47:28
-    List_Items List_Id 1268
-    1269 record type element communication_properties.aadl:48:03
-     Identifier Node_Id 1270
-     1270 identifier communication_properties.aadl:48:03
-      Corresponding_Entity Node_Id 1269
+   Expanded_Type_Designator Node_Id 1279
+   1279 record type communication_properties.aadl:47:28
+    List_Items List_Id 1270
+    1271 record type element communication_properties.aadl:48:03
+     Identifier Node_Id 1272
+     1272 identifier communication_properties.aadl:48:03
+      Corresponding_Entity Node_Id 1271
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1272
-     1272 unique property type identifier communication_properties.aadl:48:09
-      Identifier Node_Id 1271
-      1271 identifier communication_properties.aadl:48:11
+     Property_Type_Designator Node_Id 1274
+     1274 unique property type identifier communication_properties.aadl:48:09
+      Identifier Node_Id 1273
+      1273 identifier communication_properties.aadl:48:11
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1273 record type element communication_properties.aadl:49:03
-     Identifier Node_Id 1274
-     1274 identifier communication_properties.aadl:49:03
-      Corresponding_Entity Node_Id 1273
+    1275 record type element communication_properties.aadl:49:03
+     Identifier Node_Id 1276
+     1276 identifier communication_properties.aadl:49:03
+      Corresponding_Entity Node_Id 1275
       Display_Name Name_Id "Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1276
-     1276 unique property type identifier communication_properties.aadl:49:07
-      Identifier Node_Id 1275
-      1275 identifier communication_properties.aadl:49:09
+     Property_Type_Designator Node_Id 1278
+     1278 unique property type identifier communication_properties.aadl:49:07
+      Identifier Node_Id 1277
+      1277 identifier communication_properties.aadl:49:09
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "IO_Reference_Time"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1287
+      Entity Node_Id 1289
       Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1266
-  1266 property value communication_properties.aadl:44:02
-   Value_Container Node_Id 1070
+  Default_Value Node_Id 1268
+  1268 property value communication_properties.aadl:44:02
+   Value_Container Node_Id 1072
    Single_Value Node_Id 0
-   Multi_Value List_Id 1245
-   1246 record term communication_properties.aadl:44:39
-    List_Items List_Id 1247
-    1248 record term element communication_properties.aadl:44:41
-     Identifier Node_Id 1249
-     1249 identifier communication_properties.aadl:44:41
-      Corresponding_Entity Node_Id 1248
+   Multi_Value List_Id 1247
+   1248 record term communication_properties.aadl:44:39
+    List_Items List_Id 1249
+    1250 record term element communication_properties.aadl:44:41
+     Identifier Node_Id 1251
+     1251 identifier communication_properties.aadl:44:41
+      Corresponding_Entity Node_Id 1250
       Display_Name Name_Id "Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1251
-     1251 property term communication_properties.aadl:44:46
-      Identifier Node_Id 1250
-      1250 identifier communication_properties.aadl:44:49
+     Property_Expression Node_Id 1253
+     1253 property term communication_properties.aadl:44:46
+      Identifier Node_Id 1252
+      1252 identifier communication_properties.aadl:44:49
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Dispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1278
+      Entity Node_Id 1280
       Property_Set_Identifier Node_Id 0
-    1252 record term element communication_properties.aadl:44:59
-     Identifier Node_Id 1253
-     1253 identifier communication_properties.aadl:44:59
-      Corresponding_Entity Node_Id 1252
+    1254 record term element communication_properties.aadl:44:59
+     Identifier Node_Id 1255
+     1255 identifier communication_properties.aadl:44:59
+      Corresponding_Entity Node_Id 1254
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1260
-     1260 number range term communication_properties.aadl:44:69
-      Lower_Bound Node_Id 1254
-      1254 signed aadlnumber communication_properties.aadl:44:69
-       Number_Value Node_Id 1255
-       1255 literal communication_properties.aadl:44:69
+     Property_Expression Node_Id 1262
+     1262 number range term communication_properties.aadl:44:69
+      Lower_Bound Node_Id 1256
+      1256 signed aadlnumber communication_properties.aadl:44:69
+       Number_Value Node_Id 1257
+       1257 literal communication_properties.aadl:44:69
         Value Value_Id 42
-       Unit_Identifier Node_Id 1256
-       1256 identifier communication_properties.aadl:44:71
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1258
+       1258 identifier communication_properties.aadl:44:71
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 1257
-      1257 signed aadlnumber communication_properties.aadl:44:77
-       Number_Value Node_Id 1258
-       1258 literal communication_properties.aadl:44:77
+      Upper_Bound Node_Id 1259
+      1259 signed aadlnumber communication_properties.aadl:44:77
+       Number_Value Node_Id 1260
+       1260 literal communication_properties.aadl:44:77
         Value Value_Id 43
-       Unit_Identifier Node_Id 1259
-       1259 identifier communication_properties.aadl:44:79
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1261
+       1261 identifier communication_properties.aadl:44:79
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
       Delta_Term Node_Id 0
    Expanded_Single_Value Node_Id 0
-   Expanded_Multi_Value List_Id 2615
-   2616 record term communication_properties.aadl:44:39
-    List_Items List_Id 2617
-    2618 record term element communication_properties.aadl:44:39
-     Identifier Node_Id 1249
-     1249 identifier communication_properties.aadl:44:41
-      Corresponding_Entity Node_Id 1248
+   Expanded_Multi_Value List_Id 2617
+   2618 record term communication_properties.aadl:44:39
+    List_Items List_Id 2619
+    2620 record term element communication_properties.aadl:44:39
+     Identifier Node_Id 1251
+     1251 identifier communication_properties.aadl:44:41
+      Corresponding_Entity Node_Id 1250
       Display_Name Name_Id "Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
-    2619 record term element communication_properties.aadl:44:39
-     Identifier Node_Id 1253
-     1253 identifier communication_properties.aadl:44:59
-      Corresponding_Entity Node_Id 1252
+    2621 record term element communication_properties.aadl:44:39
+     Identifier Node_Id 1255
+     1255 identifier communication_properties.aadl:44:59
+      Corresponding_Entity Node_Id 1254
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2620
-     2620 number range term communication_properties.aadl:44:69
-      Lower_Bound Node_Id 2621
-      2621 signed aadlnumber communication_properties.aadl:44:69
-       Number_Value Node_Id 2622
-       2622 literal communication_properties.aadl:44:69
+     Property_Expression Node_Id 2622
+     2622 number range term communication_properties.aadl:44:69
+      Lower_Bound Node_Id 2623
+      2623 signed aadlnumber communication_properties.aadl:44:69
+       Number_Value Node_Id 2624
+       2624 literal communication_properties.aadl:44:69
         Value Value_Id 74
-       Unit_Identifier Node_Id 1256
-       1256 identifier communication_properties.aadl:44:71
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1258
+       1258 identifier communication_properties.aadl:44:71
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2623
-      2623 signed aadlnumber communication_properties.aadl:44:77
-       Number_Value Node_Id 2624
-       2624 literal communication_properties.aadl:44:77
+      Upper_Bound Node_Id 2625
+      2625 signed aadlnumber communication_properties.aadl:44:77
+       Number_Value Node_Id 2626
+       2626 literal communication_properties.aadl:44:77
         Value Value_Id 75
-       Unit_Identifier Node_Id 1259
-       1259 identifier communication_properties.aadl:44:79
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1261
+       1261 identifier communication_properties.aadl:44:79
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
       Delta_Term Node_Id 0
-  Applies_To Node_Id 1264
-  1264 applies to communication_properties.aadl:44:02
+  Applies_To Node_Id 1266
+  1266 applies to communication_properties.aadl:44:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1261
-   1262 named element communication_properties.aadl:45:15
+   Owner_Categories List_Id 1263
+   1264 named element communication_properties.aadl:45:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1278 property type declaration communication_properties.aadl:47:02
-  Identifier Node_Id 1267
-  1267 identifier communication_properties.aadl:47:02
-   Corresponding_Entity Node_Id 1278
+ 1280 property type declaration communication_properties.aadl:47:02
+  Identifier Node_Id 1269
+  1269 identifier communication_properties.aadl:47:02
+   Corresponding_Entity Node_Id 1280
    Display_Name Name_Id "IO_Time_Spec"
-   Scope_Entity Node_Id 1071
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1277
-  1277 record type communication_properties.aadl:47:28
-   List_Items List_Id 1268
-   1269 record type element communication_properties.aadl:48:03
-    Identifier Node_Id 1270
-    1270 identifier communication_properties.aadl:48:03
-     Corresponding_Entity Node_Id 1269
+   Scope_Entity Node_Id 1073
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1279
+  1279 record type communication_properties.aadl:47:28
+   List_Items List_Id 1270
+   1271 record type element communication_properties.aadl:48:03
+    Identifier Node_Id 1272
+    1272 identifier communication_properties.aadl:48:03
+     Corresponding_Entity Node_Id 1271
      Display_Name Name_Id "Offset"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 1272
-    1272 unique property type identifier communication_properties.aadl:48:09
-     Identifier Node_Id 1271
-     1271 identifier communication_properties.aadl:48:11
+    Property_Type_Designator Node_Id 1274
+    1274 unique property type identifier communication_properties.aadl:48:09
+     Identifier Node_Id 1273
+     1273 identifier communication_properties.aadl:48:11
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 1869
+     Entity Node_Id 1871
      Property_Set_Identifier Node_Id 0
-   1273 record type element communication_properties.aadl:49:03
-    Identifier Node_Id 1274
-    1274 identifier communication_properties.aadl:49:03
-     Corresponding_Entity Node_Id 1273
+   1275 record type element communication_properties.aadl:49:03
+    Identifier Node_Id 1276
+    1276 identifier communication_properties.aadl:49:03
+     Corresponding_Entity Node_Id 1275
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 1276
-    1276 unique property type identifier communication_properties.aadl:49:07
-     Identifier Node_Id 1275
-     1275 identifier communication_properties.aadl:49:09
+    Property_Type_Designator Node_Id 1278
+    1278 unique property type identifier communication_properties.aadl:49:07
+     Identifier Node_Id 1277
+     1277 identifier communication_properties.aadl:49:09
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "IO_Reference_Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 1287
+     Entity Node_Id 1289
      Property_Set_Identifier Node_Id 0
- 1287 property type declaration communication_properties.aadl:52:02
-  Identifier Node_Id 1279
-  1279 identifier communication_properties.aadl:52:02
-   Corresponding_Entity Node_Id 1287
+ 1289 property type declaration communication_properties.aadl:52:02
+  Identifier Node_Id 1281
+  1281 identifier communication_properties.aadl:52:02
+   Corresponding_Entity Node_Id 1289
    Display_Name Name_Id "IO_Reference_Time"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1280
-  1280 enumeration type communication_properties.aadl:52:26
-   Identifiers List_Id 1281
-   1282 identifier communication_properties.aadl:52:39
-    Corresponding_Entity Node_Id 1280
+  Property_Type_Designator Node_Id 1282
+  1282 enumeration type communication_properties.aadl:52:26
+   Identifiers List_Id 1283
+   1284 identifier communication_properties.aadl:52:39
+    Corresponding_Entity Node_Id 1282
     Display_Name Name_Id "Dispatch"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1283 identifier communication_properties.aadl:52:49
-    Corresponding_Entity Node_Id 1280
+   1285 identifier communication_properties.aadl:52:49
+    Corresponding_Entity Node_Id 1282
     Display_Name Name_Id "Start"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1284 identifier communication_properties.aadl:52:56
-    Corresponding_Entity Node_Id 1280
+   1286 identifier communication_properties.aadl:52:56
+    Corresponding_Entity Node_Id 1282
     Display_Name Name_Id "Completion"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1285 identifier communication_properties.aadl:52:68
-    Corresponding_Entity Node_Id 1280
+   1287 identifier communication_properties.aadl:52:68
+    Corresponding_Entity Node_Id 1282
     Display_Name Name_Id "Deadline"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1286 identifier communication_properties.aadl:52:78
-    Corresponding_Entity Node_Id 1280
+   1288 identifier communication_properties.aadl:52:78
+    Corresponding_Entity Node_Id 1282
     Display_Name Name_Id "NoIO"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
    Enumeration_Context Node_Id 0
- 1311 property definition declaration communication_properties.aadl:54:02
-  Identifier Node_Id 1288
-  1288 identifier communication_properties.aadl:54:02
-   Corresponding_Entity Node_Id 1311
+ 1313 property definition declaration communication_properties.aadl:54:02
+  Identifier Node_Id 1290
+  1290 identifier communication_properties.aadl:54:02
+   Corresponding_Entity Node_Id 1313
    Display_Name Name_Id "Output_Rate"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1313
-  1313 property type communication_properties.aadl:54:02
+  Property_Name_Type Node_Id 1315
+  1315 property type communication_properties.aadl:54:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1290
-   1290 unique property type identifier communication_properties.aadl:54:13
-    Identifier Node_Id 1289
-    1289 identifier communication_properties.aadl:54:15
+   Property_Type_Designator Node_Id 1292
+   1292 unique property type identifier communication_properties.aadl:54:13
+    Identifier Node_Id 1291
+    1291 identifier communication_properties.aadl:54:15
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Rate_Spec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1358
+    Entity Node_Id 1360
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1357
-   1357 record type communication_properties.aadl:60:25
-    List_Items List_Id 1342
-    1343 record type element communication_properties.aadl:61:03
-     Identifier Node_Id 1344
-     1344 identifier communication_properties.aadl:61:03
-      Corresponding_Entity Node_Id 1343
+   Expanded_Type_Designator Node_Id 1359
+   1359 record type communication_properties.aadl:60:25
+    List_Items List_Id 1344
+    1345 record type element communication_properties.aadl:61:03
+     Identifier Node_Id 1346
+     1346 identifier communication_properties.aadl:61:03
+      Corresponding_Entity Node_Id 1345
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1345
-     1345 range type communication_properties.aadl:61:16
-      Number_Type Node_Id 1346
-      1346 real type communication_properties.aadl:61:25
+     Property_Type_Designator Node_Id 1347
+     1347 range type communication_properties.aadl:61:16
+      Number_Type Node_Id 1348
+      1348 real type communication_properties.aadl:61:25
        Type_Range Node_Id 0
        Unit_Designator Node_Id 0
-    1347 record type element communication_properties.aadl:62:03
-     Identifier Node_Id 1348
-     1348 identifier communication_properties.aadl:62:03
-      Corresponding_Entity Node_Id 1347
+    1349 record type element communication_properties.aadl:62:03
+     Identifier Node_Id 1350
+     1350 identifier communication_properties.aadl:62:03
+      Corresponding_Entity Node_Id 1349
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1349
-     1349 enumeration type communication_properties.aadl:62:14
-      Identifiers List_Id 1350
-      1351 identifier communication_properties.aadl:62:27
-       Corresponding_Entity Node_Id 1349
+     Property_Type_Designator Node_Id 1351
+     1351 enumeration type communication_properties.aadl:62:14
+      Identifiers List_Id 1352
+      1353 identifier communication_properties.aadl:62:27
+       Corresponding_Entity Node_Id 1351
        Display_Name Name_Id "PerSecond"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      1352 identifier communication_properties.aadl:62:38
-       Corresponding_Entity Node_Id 1349
+      1354 identifier communication_properties.aadl:62:38
+       Corresponding_Entity Node_Id 1351
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Enumeration_Context Node_Id 0
-    1353 record type element communication_properties.aadl:63:03
-     Identifier Node_Id 1354
-     1354 identifier communication_properties.aadl:63:03
-      Corresponding_Entity Node_Id 1353
+    1355 record type element communication_properties.aadl:63:03
+     Identifier Node_Id 1356
+     1356 identifier communication_properties.aadl:63:03
+      Corresponding_Entity Node_Id 1355
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1356
-     1356 unique property type identifier communication_properties.aadl:63:20
-      Identifier Node_Id 1355
-      1355 identifier communication_properties.aadl:63:22
+     Property_Type_Designator Node_Id 1358
+     1358 unique property type identifier communication_properties.aadl:63:20
+      Identifier Node_Id 1357
+      1357 identifier communication_properties.aadl:63:22
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Supported_Distributions"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Entity Node_Id 0
       Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1314
-  1314 property value communication_properties.aadl:54:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 1291
-   1291 record term communication_properties.aadl:54:28
-    List_Items List_Id 1292
-    1293 record term element communication_properties.aadl:54:30
-     Identifier Node_Id 1294
-     1294 identifier communication_properties.aadl:54:30
-      Corresponding_Entity Node_Id 1293
+  Default_Value Node_Id 1316
+  1316 property value communication_properties.aadl:54:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 1293
+   1293 record term communication_properties.aadl:54:28
+    List_Items List_Id 1294
+    1295 record term element communication_properties.aadl:54:30
+     Identifier Node_Id 1296
+     1296 identifier communication_properties.aadl:54:30
+      Corresponding_Entity Node_Id 1295
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1299
-     1299 number range term communication_properties.aadl:54:45
-      Lower_Bound Node_Id 1295
-      1295 signed aadlnumber communication_properties.aadl:54:45
-       Number_Value Node_Id 1296
-       1296 literal communication_properties.aadl:54:45
+     Property_Expression Node_Id 1301
+     1301 number range term communication_properties.aadl:54:45
+      Lower_Bound Node_Id 1297
+      1297 signed aadlnumber communication_properties.aadl:54:45
+       Number_Value Node_Id 1298
+       1298 literal communication_properties.aadl:54:45
         Value Value_Id 44
        Unit_Identifier Node_Id 0
-      Upper_Bound Node_Id 1297
-      1297 signed aadlnumber communication_properties.aadl:54:52
-       Number_Value Node_Id 1298
-       1298 literal communication_properties.aadl:54:52
+      Upper_Bound Node_Id 1299
+      1299 signed aadlnumber communication_properties.aadl:54:52
+       Number_Value Node_Id 1300
+       1300 literal communication_properties.aadl:54:52
         Value Value_Id 45
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    1300 record term element communication_properties.aadl:54:57
-     Identifier Node_Id 1301
-     1301 identifier communication_properties.aadl:54:57
-      Corresponding_Entity Node_Id 1300
+    1302 record term element communication_properties.aadl:54:57
+     Identifier Node_Id 1303
+     1303 identifier communication_properties.aadl:54:57
+      Corresponding_Entity Node_Id 1302
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1303
-     1303 property term communication_properties.aadl:54:67
-      Identifier Node_Id 1302
-      1302 identifier communication_properties.aadl:54:70
+     Property_Expression Node_Id 1305
+     1305 property term communication_properties.aadl:54:67
+      Identifier Node_Id 1304
+      1304 identifier communication_properties.aadl:54:70
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1358
+      Entity Node_Id 1360
       Property_Set_Identifier Node_Id 0
-    1304 record term element communication_properties.aadl:54:83
-     Identifier Node_Id 1305
-     1305 identifier communication_properties.aadl:54:83
-      Corresponding_Entity Node_Id 1304
+    1306 record term element communication_properties.aadl:54:83
+     Identifier Node_Id 1307
+     1307 identifier communication_properties.aadl:54:83
+      Corresponding_Entity Node_Id 1306
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1307
-     1307 property term communication_properties.aadl:54:101
-      Identifier Node_Id 1306
-      1306 identifier communication_properties.aadl:54:104
+     Property_Expression Node_Id 1309
+     1309 property term communication_properties.aadl:54:101
+      Identifier Node_Id 1308
+      1308 identifier communication_properties.aadl:54:104
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Fixed"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1358
+      Entity Node_Id 1360
       Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2625
-   2625 record term communication_properties.aadl:54:28
-    List_Items List_Id 2626
-    2627 record term element communication_properties.aadl:54:28
-     Identifier Node_Id 1294
-     1294 identifier communication_properties.aadl:54:30
-      Corresponding_Entity Node_Id 1293
+   Expanded_Single_Value Node_Id 2627
+   2627 record term communication_properties.aadl:54:28
+    List_Items List_Id 2628
+    2629 record term element communication_properties.aadl:54:28
+     Identifier Node_Id 1296
+     1296 identifier communication_properties.aadl:54:30
+      Corresponding_Entity Node_Id 1295
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2628
-     2628 number range term communication_properties.aadl:54:45
-      Lower_Bound Node_Id 2629
-      2629 signed aadlnumber communication_properties.aadl:54:45
-       Number_Value Node_Id 2630
-       2630 literal communication_properties.aadl:54:45
+     Property_Expression Node_Id 2630
+     2630 number range term communication_properties.aadl:54:45
+      Lower_Bound Node_Id 2631
+      2631 signed aadlnumber communication_properties.aadl:54:45
+       Number_Value Node_Id 2632
+       2632 literal communication_properties.aadl:54:45
         Value Value_Id 76
        Unit_Identifier Node_Id 0
-      Upper_Bound Node_Id 2631
-      2631 signed aadlnumber communication_properties.aadl:54:52
-       Number_Value Node_Id 2632
-       2632 literal communication_properties.aadl:54:52
+      Upper_Bound Node_Id 2633
+      2633 signed aadlnumber communication_properties.aadl:54:52
+       Number_Value Node_Id 2634
+       2634 literal communication_properties.aadl:54:52
         Value Value_Id 77
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    2633 record term element communication_properties.aadl:54:28
-     Identifier Node_Id 1301
-     1301 identifier communication_properties.aadl:54:57
-      Corresponding_Entity Node_Id 1300
+    2635 record term element communication_properties.aadl:54:28
+     Identifier Node_Id 1303
+     1303 identifier communication_properties.aadl:54:57
+      Corresponding_Entity Node_Id 1302
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
-    2634 record term element communication_properties.aadl:54:28
-     Identifier Node_Id 1305
-     1305 identifier communication_properties.aadl:54:83
-      Corresponding_Entity Node_Id 1304
+    2636 record term element communication_properties.aadl:54:28
+     Identifier Node_Id 1307
+     1307 identifier communication_properties.aadl:54:83
+      Corresponding_Entity Node_Id 1306
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1312
-  1312 applies to communication_properties.aadl:54:02
+  Applies_To Node_Id 1314
+  1314 applies to communication_properties.aadl:54:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1309
-   1310 named element communication_properties.aadl:55:15
+   Owner_Categories List_Id 1311
+   1312 named element communication_properties.aadl:55:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1337 property definition declaration communication_properties.aadl:57:02
-  Identifier Node_Id 1315
-  1315 identifier communication_properties.aadl:57:02
-   Corresponding_Entity Node_Id 1337
+ 1339 property definition declaration communication_properties.aadl:57:02
+  Identifier Node_Id 1317
+  1317 identifier communication_properties.aadl:57:02
+   Corresponding_Entity Node_Id 1339
    Display_Name Name_Id "Output_Time"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1339
-  1339 property type communication_properties.aadl:57:02
+  Property_Name_Type Node_Id 1341
+  1341 property type communication_properties.aadl:57:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 1318
-   1318 unique property type identifier communication_properties.aadl:57:20
-    Identifier Node_Id 1317
-    1317 identifier communication_properties.aadl:57:23
+   Property_Type_Designator Node_Id 1320
+   1320 unique property type identifier communication_properties.aadl:57:20
+    Identifier Node_Id 1319
+    1319 identifier communication_properties.aadl:57:23
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "IO_Time_Spec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1278
+    Entity Node_Id 1280
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1277
-   1277 record type communication_properties.aadl:47:28
-    List_Items List_Id 1268
-    1269 record type element communication_properties.aadl:48:03
-     Identifier Node_Id 1270
-     1270 identifier communication_properties.aadl:48:03
-      Corresponding_Entity Node_Id 1269
+   Expanded_Type_Designator Node_Id 1279
+   1279 record type communication_properties.aadl:47:28
+    List_Items List_Id 1270
+    1271 record type element communication_properties.aadl:48:03
+     Identifier Node_Id 1272
+     1272 identifier communication_properties.aadl:48:03
+      Corresponding_Entity Node_Id 1271
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1272
-     1272 unique property type identifier communication_properties.aadl:48:09
-      Identifier Node_Id 1271
-      1271 identifier communication_properties.aadl:48:11
+     Property_Type_Designator Node_Id 1274
+     1274 unique property type identifier communication_properties.aadl:48:09
+      Identifier Node_Id 1273
+      1273 identifier communication_properties.aadl:48:11
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1273 record type element communication_properties.aadl:49:03
-     Identifier Node_Id 1274
-     1274 identifier communication_properties.aadl:49:03
-      Corresponding_Entity Node_Id 1273
+    1275 record type element communication_properties.aadl:49:03
+     Identifier Node_Id 1276
+     1276 identifier communication_properties.aadl:49:03
+      Corresponding_Entity Node_Id 1275
       Display_Name Name_Id "Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1276
-     1276 unique property type identifier communication_properties.aadl:49:07
-      Identifier Node_Id 1275
-      1275 identifier communication_properties.aadl:49:09
+     Property_Type_Designator Node_Id 1278
+     1278 unique property type identifier communication_properties.aadl:49:07
+      Identifier Node_Id 1277
+      1277 identifier communication_properties.aadl:49:09
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "IO_Reference_Time"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1287
+      Entity Node_Id 1289
       Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1340
-  1340 property value communication_properties.aadl:57:02
-   Value_Container Node_Id 1070
+  Default_Value Node_Id 1342
+  1342 property value communication_properties.aadl:57:02
+   Value_Container Node_Id 1072
    Single_Value Node_Id 0
-   Multi_Value List_Id 1319
-   1320 record term communication_properties.aadl:57:40
-    List_Items List_Id 1321
-    1322 record term element communication_properties.aadl:57:42
-     Identifier Node_Id 1323
-     1323 identifier communication_properties.aadl:57:42
-      Corresponding_Entity Node_Id 1322
+   Multi_Value List_Id 1321
+   1322 record term communication_properties.aadl:57:40
+    List_Items List_Id 1323
+    1324 record term element communication_properties.aadl:57:42
+     Identifier Node_Id 1325
+     1325 identifier communication_properties.aadl:57:42
+      Corresponding_Entity Node_Id 1324
       Display_Name Name_Id "Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1325
-     1325 property term communication_properties.aadl:57:47
-      Identifier Node_Id 1324
-      1324 identifier communication_properties.aadl:57:50
+     Property_Expression Node_Id 1327
+     1327 property term communication_properties.aadl:57:47
+      Identifier Node_Id 1326
+      1326 identifier communication_properties.aadl:57:50
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Completion"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1278
+      Entity Node_Id 1280
       Property_Set_Identifier Node_Id 0
-    1326 record term element communication_properties.aadl:57:62
-     Identifier Node_Id 1327
-     1327 identifier communication_properties.aadl:57:62
-      Corresponding_Entity Node_Id 1326
+    1328 record term element communication_properties.aadl:57:62
+     Identifier Node_Id 1329
+     1329 identifier communication_properties.aadl:57:62
+      Corresponding_Entity Node_Id 1328
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1334
-     1334 number range term communication_properties.aadl:57:72
-      Lower_Bound Node_Id 1328
-      1328 signed aadlnumber communication_properties.aadl:57:72
-       Number_Value Node_Id 1329
-       1329 literal communication_properties.aadl:57:72
+     Property_Expression Node_Id 1336
+     1336 number range term communication_properties.aadl:57:72
+      Lower_Bound Node_Id 1330
+      1330 signed aadlnumber communication_properties.aadl:57:72
+       Number_Value Node_Id 1331
+       1331 literal communication_properties.aadl:57:72
         Value Value_Id 46
-       Unit_Identifier Node_Id 1330
-       1330 identifier communication_properties.aadl:57:74
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1332
+       1332 identifier communication_properties.aadl:57:74
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 1331
-      1331 signed aadlnumber communication_properties.aadl:57:80
-       Number_Value Node_Id 1332
-       1332 literal communication_properties.aadl:57:80
+      Upper_Bound Node_Id 1333
+      1333 signed aadlnumber communication_properties.aadl:57:80
+       Number_Value Node_Id 1334
+       1334 literal communication_properties.aadl:57:80
         Value Value_Id 47
-       Unit_Identifier Node_Id 1333
-       1333 identifier communication_properties.aadl:57:82
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1335
+       1335 identifier communication_properties.aadl:57:82
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
       Delta_Term Node_Id 0
    Expanded_Single_Value Node_Id 0
-   Expanded_Multi_Value List_Id 2635
-   2636 record term communication_properties.aadl:57:40
-    List_Items List_Id 2637
-    2638 record term element communication_properties.aadl:57:40
-     Identifier Node_Id 1323
-     1323 identifier communication_properties.aadl:57:42
-      Corresponding_Entity Node_Id 1322
+   Expanded_Multi_Value List_Id 2637
+   2638 record term communication_properties.aadl:57:40
+    List_Items List_Id 2639
+    2640 record term element communication_properties.aadl:57:40
+     Identifier Node_Id 1325
+     1325 identifier communication_properties.aadl:57:42
+      Corresponding_Entity Node_Id 1324
       Display_Name Name_Id "Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
-    2639 record term element communication_properties.aadl:57:40
-     Identifier Node_Id 1327
-     1327 identifier communication_properties.aadl:57:62
-      Corresponding_Entity Node_Id 1326
+    2641 record term element communication_properties.aadl:57:40
+     Identifier Node_Id 1329
+     1329 identifier communication_properties.aadl:57:62
+      Corresponding_Entity Node_Id 1328
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2640
-     2640 number range term communication_properties.aadl:57:72
-      Lower_Bound Node_Id 2641
-      2641 signed aadlnumber communication_properties.aadl:57:72
-       Number_Value Node_Id 2642
-       2642 literal communication_properties.aadl:57:72
+     Property_Expression Node_Id 2642
+     2642 number range term communication_properties.aadl:57:72
+      Lower_Bound Node_Id 2643
+      2643 signed aadlnumber communication_properties.aadl:57:72
+       Number_Value Node_Id 2644
+       2644 literal communication_properties.aadl:57:72
         Value Value_Id 78
-       Unit_Identifier Node_Id 1330
-       1330 identifier communication_properties.aadl:57:74
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1332
+       1332 identifier communication_properties.aadl:57:74
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2643
-      2643 signed aadlnumber communication_properties.aadl:57:80
-       Number_Value Node_Id 2644
-       2644 literal communication_properties.aadl:57:80
+      Upper_Bound Node_Id 2645
+      2645 signed aadlnumber communication_properties.aadl:57:80
+       Number_Value Node_Id 2646
+       2646 literal communication_properties.aadl:57:80
         Value Value_Id 79
-       Unit_Identifier Node_Id 1333
-       1333 identifier communication_properties.aadl:57:82
-        Corresponding_Entity Node_Id 250
+       Unit_Identifier Node_Id 1335
+       1335 identifier communication_properties.aadl:57:82
+        Corresponding_Entity Node_Id 252
         Display_Name Name_Id "ns"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
       Delta_Term Node_Id 0
-  Applies_To Node_Id 1338
-  1338 applies to communication_properties.aadl:57:02
+  Applies_To Node_Id 1340
+  1340 applies to communication_properties.aadl:57:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1335
-   1336 named element communication_properties.aadl:58:15
+   Owner_Categories List_Id 1337
+   1338 named element communication_properties.aadl:58:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1358 property type declaration communication_properties.aadl:60:02
-  Identifier Node_Id 1341
-  1341 identifier communication_properties.aadl:60:02
-   Corresponding_Entity Node_Id 1358
+ 1360 property type declaration communication_properties.aadl:60:02
+  Identifier Node_Id 1343
+  1343 identifier communication_properties.aadl:60:02
+   Corresponding_Entity Node_Id 1360
    Display_Name Name_Id "Rate_Spec"
-   Scope_Entity Node_Id 1071
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1357
-  1357 record type communication_properties.aadl:60:25
-   List_Items List_Id 1342
-   1343 record type element communication_properties.aadl:61:03
-    Identifier Node_Id 1344
-    1344 identifier communication_properties.aadl:61:03
-     Corresponding_Entity Node_Id 1343
+   Scope_Entity Node_Id 1073
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1359
+  1359 record type communication_properties.aadl:60:25
+   List_Items List_Id 1344
+   1345 record type element communication_properties.aadl:61:03
+    Identifier Node_Id 1346
+    1346 identifier communication_properties.aadl:61:03
+     Corresponding_Entity Node_Id 1345
      Display_Name Name_Id "Value_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 1345
-    1345 range type communication_properties.aadl:61:16
-     Number_Type Node_Id 1346
-     1346 real type communication_properties.aadl:61:25
+    Property_Type_Designator Node_Id 1347
+    1347 range type communication_properties.aadl:61:16
+     Number_Type Node_Id 1348
+     1348 real type communication_properties.aadl:61:25
       Type_Range Node_Id 0
       Unit_Designator Node_Id 0
-   1347 record type element communication_properties.aadl:62:03
-    Identifier Node_Id 1348
-    1348 identifier communication_properties.aadl:62:03
-     Corresponding_Entity Node_Id 1347
+   1349 record type element communication_properties.aadl:62:03
+    Identifier Node_Id 1350
+    1350 identifier communication_properties.aadl:62:03
+     Corresponding_Entity Node_Id 1349
      Display_Name Name_Id "Rate_Unit"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 1349
-    1349 enumeration type communication_properties.aadl:62:14
-     Identifiers List_Id 1350
-     1351 identifier communication_properties.aadl:62:27
-      Corresponding_Entity Node_Id 1349
+    Property_Type_Designator Node_Id 1351
+    1351 enumeration type communication_properties.aadl:62:14
+     Identifiers List_Id 1352
+     1353 identifier communication_properties.aadl:62:27
+      Corresponding_Entity Node_Id 1351
       Display_Name Name_Id "PerSecond"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     1352 identifier communication_properties.aadl:62:38
-      Corresponding_Entity Node_Id 1349
+     1354 identifier communication_properties.aadl:62:38
+      Corresponding_Entity Node_Id 1351
       Display_Name Name_Id "PerDispatch"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Enumeration_Context Node_Id 0
-   1353 record type element communication_properties.aadl:63:03
-    Identifier Node_Id 1354
-    1354 identifier communication_properties.aadl:63:03
-     Corresponding_Entity Node_Id 1353
+   1355 record type element communication_properties.aadl:63:03
+    Identifier Node_Id 1356
+    1356 identifier communication_properties.aadl:63:03
+     Corresponding_Entity Node_Id 1355
      Display_Name Name_Id "Rate_Distribution"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Is_List Boolean FALSE
-    Property_Type_Designator Node_Id 1356
-    1356 unique property type identifier communication_properties.aadl:63:20
-     Identifier Node_Id 1355
-     1355 identifier communication_properties.aadl:63:22
+    Property_Type_Designator Node_Id 1358
+    1358 unique property type identifier communication_properties.aadl:63:20
+     Identifier Node_Id 1357
+     1357 identifier communication_properties.aadl:63:22
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Supported_Distributions"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Entity Node_Id 0
      Property_Set_Identifier Node_Id 0
- 1382 property definition declaration communication_properties.aadl:66:02
-  Identifier Node_Id 1359
-  1359 identifier communication_properties.aadl:66:02
-   Corresponding_Entity Node_Id 1382
+ 1384 property definition declaration communication_properties.aadl:66:02
+  Identifier Node_Id 1361
+  1361 identifier communication_properties.aadl:66:02
+   Corresponding_Entity Node_Id 1384
    Display_Name Name_Id "Subprogram_Call_Rate"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1384
-  1384 property type communication_properties.aadl:66:02
+  Property_Name_Type Node_Id 1386
+  1386 property type communication_properties.aadl:66:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1361
-   1361 unique property type identifier communication_properties.aadl:66:22
-    Identifier Node_Id 1360
-    1360 identifier communication_properties.aadl:66:24
+   Property_Type_Designator Node_Id 1363
+   1363 unique property type identifier communication_properties.aadl:66:22
+    Identifier Node_Id 1362
+    1362 identifier communication_properties.aadl:66:24
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Rate_Spec"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1358
+    Entity Node_Id 1360
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1357
-   1357 record type communication_properties.aadl:60:25
-    List_Items List_Id 1342
-    1343 record type element communication_properties.aadl:61:03
-     Identifier Node_Id 1344
-     1344 identifier communication_properties.aadl:61:03
-      Corresponding_Entity Node_Id 1343
+   Expanded_Type_Designator Node_Id 1359
+   1359 record type communication_properties.aadl:60:25
+    List_Items List_Id 1344
+    1345 record type element communication_properties.aadl:61:03
+     Identifier Node_Id 1346
+     1346 identifier communication_properties.aadl:61:03
+      Corresponding_Entity Node_Id 1345
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1345
-     1345 range type communication_properties.aadl:61:16
-      Number_Type Node_Id 1346
-      1346 real type communication_properties.aadl:61:25
+     Property_Type_Designator Node_Id 1347
+     1347 range type communication_properties.aadl:61:16
+      Number_Type Node_Id 1348
+      1348 real type communication_properties.aadl:61:25
        Type_Range Node_Id 0
        Unit_Designator Node_Id 0
-    1347 record type element communication_properties.aadl:62:03
-     Identifier Node_Id 1348
-     1348 identifier communication_properties.aadl:62:03
-      Corresponding_Entity Node_Id 1347
+    1349 record type element communication_properties.aadl:62:03
+     Identifier Node_Id 1350
+     1350 identifier communication_properties.aadl:62:03
+      Corresponding_Entity Node_Id 1349
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1349
-     1349 enumeration type communication_properties.aadl:62:14
-      Identifiers List_Id 1350
-      1351 identifier communication_properties.aadl:62:27
-       Corresponding_Entity Node_Id 1349
+     Property_Type_Designator Node_Id 1351
+     1351 enumeration type communication_properties.aadl:62:14
+      Identifiers List_Id 1352
+      1353 identifier communication_properties.aadl:62:27
+       Corresponding_Entity Node_Id 1351
        Display_Name Name_Id "PerSecond"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      1352 identifier communication_properties.aadl:62:38
-       Corresponding_Entity Node_Id 1349
+      1354 identifier communication_properties.aadl:62:38
+       Corresponding_Entity Node_Id 1351
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Enumeration_Context Node_Id 0
-    1353 record type element communication_properties.aadl:63:03
-     Identifier Node_Id 1354
-     1354 identifier communication_properties.aadl:63:03
-      Corresponding_Entity Node_Id 1353
+    1355 record type element communication_properties.aadl:63:03
+     Identifier Node_Id 1356
+     1356 identifier communication_properties.aadl:63:03
+      Corresponding_Entity Node_Id 1355
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1356
-     1356 unique property type identifier communication_properties.aadl:63:20
-      Identifier Node_Id 1355
-      1355 identifier communication_properties.aadl:63:22
+     Property_Type_Designator Node_Id 1358
+     1358 unique property type identifier communication_properties.aadl:63:20
+      Identifier Node_Id 1357
+      1357 identifier communication_properties.aadl:63:22
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Supported_Distributions"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Entity Node_Id 0
       Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1385
-  1385 property value communication_properties.aadl:66:02
-   Value_Container Node_Id 1070
-   Single_Value Node_Id 1362
-   1362 record term communication_properties.aadl:66:37
-    List_Items List_Id 1363
-    1364 record term element communication_properties.aadl:66:39
-     Identifier Node_Id 1365
-     1365 identifier communication_properties.aadl:66:39
-      Corresponding_Entity Node_Id 1364
+  Default_Value Node_Id 1387
+  1387 property value communication_properties.aadl:66:02
+   Value_Container Node_Id 1072
+   Single_Value Node_Id 1364
+   1364 record term communication_properties.aadl:66:37
+    List_Items List_Id 1365
+    1366 record term element communication_properties.aadl:66:39
+     Identifier Node_Id 1367
+     1367 identifier communication_properties.aadl:66:39
+      Corresponding_Entity Node_Id 1366
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1370
-     1370 number range term communication_properties.aadl:66:54
-      Lower_Bound Node_Id 1366
-      1366 signed aadlnumber communication_properties.aadl:66:54
-       Number_Value Node_Id 1367
-       1367 literal communication_properties.aadl:66:54
+     Property_Expression Node_Id 1372
+     1372 number range term communication_properties.aadl:66:54
+      Lower_Bound Node_Id 1368
+      1368 signed aadlnumber communication_properties.aadl:66:54
+       Number_Value Node_Id 1369
+       1369 literal communication_properties.aadl:66:54
         Value Value_Id 48
        Unit_Identifier Node_Id 0
-      Upper_Bound Node_Id 1368
-      1368 signed aadlnumber communication_properties.aadl:66:61
-       Number_Value Node_Id 1369
-       1369 literal communication_properties.aadl:66:61
+      Upper_Bound Node_Id 1370
+      1370 signed aadlnumber communication_properties.aadl:66:61
+       Number_Value Node_Id 1371
+       1371 literal communication_properties.aadl:66:61
         Value Value_Id 49
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    1371 record term element communication_properties.aadl:66:66
-     Identifier Node_Id 1372
-     1372 identifier communication_properties.aadl:66:66
-      Corresponding_Entity Node_Id 1371
+    1373 record term element communication_properties.aadl:66:66
+     Identifier Node_Id 1374
+     1374 identifier communication_properties.aadl:66:66
+      Corresponding_Entity Node_Id 1373
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1374
-     1374 property term communication_properties.aadl:66:76
-      Identifier Node_Id 1373
-      1373 identifier communication_properties.aadl:66:79
+     Property_Expression Node_Id 1376
+     1376 property term communication_properties.aadl:66:76
+      Identifier Node_Id 1375
+      1375 identifier communication_properties.aadl:66:79
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1358
+      Entity Node_Id 1360
       Property_Set_Identifier Node_Id 0
-    1375 record term element communication_properties.aadl:66:92
-     Identifier Node_Id 1376
-     1376 identifier communication_properties.aadl:66:92
-      Corresponding_Entity Node_Id 1375
+    1377 record term element communication_properties.aadl:66:92
+     Identifier Node_Id 1378
+     1378 identifier communication_properties.aadl:66:92
+      Corresponding_Entity Node_Id 1377
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1378
-     1378 property term communication_properties.aadl:66:110
-      Identifier Node_Id 1377
-      1377 identifier communication_properties.aadl:66:113
+     Property_Expression Node_Id 1380
+     1380 property term communication_properties.aadl:66:110
+      Identifier Node_Id 1379
+      1379 identifier communication_properties.aadl:66:113
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Fixed"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1358
+      Entity Node_Id 1360
       Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2645
-   2645 record term communication_properties.aadl:66:37
-    List_Items List_Id 2646
-    2647 record term element communication_properties.aadl:66:37
-     Identifier Node_Id 1365
-     1365 identifier communication_properties.aadl:66:39
-      Corresponding_Entity Node_Id 1364
+   Expanded_Single_Value Node_Id 2647
+   2647 record term communication_properties.aadl:66:37
+    List_Items List_Id 2648
+    2649 record term element communication_properties.aadl:66:37
+     Identifier Node_Id 1367
+     1367 identifier communication_properties.aadl:66:39
+      Corresponding_Entity Node_Id 1366
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2648
-     2648 number range term communication_properties.aadl:66:54
-      Lower_Bound Node_Id 2649
-      2649 signed aadlnumber communication_properties.aadl:66:54
-       Number_Value Node_Id 2650
-       2650 literal communication_properties.aadl:66:54
+     Property_Expression Node_Id 2650
+     2650 number range term communication_properties.aadl:66:54
+      Lower_Bound Node_Id 2651
+      2651 signed aadlnumber communication_properties.aadl:66:54
+       Number_Value Node_Id 2652
+       2652 literal communication_properties.aadl:66:54
         Value Value_Id 80
        Unit_Identifier Node_Id 0
-      Upper_Bound Node_Id 2651
-      2651 signed aadlnumber communication_properties.aadl:66:61
-       Number_Value Node_Id 2652
-       2652 literal communication_properties.aadl:66:61
+      Upper_Bound Node_Id 2653
+      2653 signed aadlnumber communication_properties.aadl:66:61
+       Number_Value Node_Id 2654
+       2654 literal communication_properties.aadl:66:61
         Value Value_Id 81
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    2653 record term element communication_properties.aadl:66:37
-     Identifier Node_Id 1372
-     1372 identifier communication_properties.aadl:66:66
-      Corresponding_Entity Node_Id 1371
+    2655 record term element communication_properties.aadl:66:37
+     Identifier Node_Id 1374
+     1374 identifier communication_properties.aadl:66:66
+      Corresponding_Entity Node_Id 1373
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
-    2654 record term element communication_properties.aadl:66:37
-     Identifier Node_Id 1376
-     1376 identifier communication_properties.aadl:66:92
-      Corresponding_Entity Node_Id 1375
+    2656 record term element communication_properties.aadl:66:37
+     Identifier Node_Id 1378
+     1378 identifier communication_properties.aadl:66:92
+      Corresponding_Entity Node_Id 1377
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1383
-  1383 applies to communication_properties.aadl:66:02
+  Applies_To Node_Id 1385
+  1385 applies to communication_properties.aadl:66:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1380
-   1381 named element communication_properties.aadl:67:15
+   Owner_Categories List_Id 1382
+   1383 named element communication_properties.aadl:67:15
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1400 property definition declaration communication_properties.aadl:69:02
-  Identifier Node_Id 1386
-  1386 identifier communication_properties.aadl:69:02
-   Corresponding_Entity Node_Id 1400
+ 1402 property definition declaration communication_properties.aadl:69:02
+  Identifier Node_Id 1388
+  1388 identifier communication_properties.aadl:69:02
+   Corresponding_Entity Node_Id 1402
    Display_Name Name_Id "Transmission_Time"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1402
-  1402 property type communication_properties.aadl:69:02
+  Property_Name_Type Node_Id 1404
+  1404 property type communication_properties.aadl:69:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1396
-   1396 record type communication_properties.aadl:69:28
-    List_Items List_Id 1387
-    1388 record type element communication_properties.aadl:70:04
-     Identifier Node_Id 1389
-     1389 identifier communication_properties.aadl:70:04
-      Corresponding_Entity Node_Id 1388
+   Property_Type_Designator Node_Id 1398
+   1398 record type communication_properties.aadl:69:28
+    List_Items List_Id 1389
+    1390 record type element communication_properties.aadl:70:04
+     Identifier Node_Id 1391
+     1391 identifier communication_properties.aadl:70:04
+      Corresponding_Entity Node_Id 1390
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1391
-     1391 unique property type identifier communication_properties.aadl:70:09
-      Identifier Node_Id 1390
-      1390 identifier communication_properties.aadl:70:11
+     Property_Type_Designator Node_Id 1393
+     1393 unique property type identifier communication_properties.aadl:70:09
+      Identifier Node_Id 1392
+      1392 identifier communication_properties.aadl:70:11
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1392 record type element communication_properties.aadl:71:04
-     Identifier Node_Id 1393
-     1393 identifier communication_properties.aadl:71:04
-      Corresponding_Entity Node_Id 1392
+    1394 record type element communication_properties.aadl:71:04
+     Identifier Node_Id 1395
+     1395 identifier communication_properties.aadl:71:04
+      Corresponding_Entity Node_Id 1394
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1395
-     1395 unique property type identifier communication_properties.aadl:71:11
-      Identifier Node_Id 1394
-      1394 identifier communication_properties.aadl:71:13
+     Property_Type_Designator Node_Id 1397
+     1397 unique property type identifier communication_properties.aadl:71:11
+      Identifier Node_Id 1396
+      1396 identifier communication_properties.aadl:71:13
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1396
-   1396 record type communication_properties.aadl:69:28
-    List_Items List_Id 1387
-    1388 record type element communication_properties.aadl:70:04
-     Identifier Node_Id 1389
-     1389 identifier communication_properties.aadl:70:04
-      Corresponding_Entity Node_Id 1388
+   Expanded_Type_Designator Node_Id 1398
+   1398 record type communication_properties.aadl:69:28
+    List_Items List_Id 1389
+    1390 record type element communication_properties.aadl:70:04
+     Identifier Node_Id 1391
+     1391 identifier communication_properties.aadl:70:04
+      Corresponding_Entity Node_Id 1390
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1391
-     1391 unique property type identifier communication_properties.aadl:70:09
-      Identifier Node_Id 1390
-      1390 identifier communication_properties.aadl:70:11
+     Property_Type_Designator Node_Id 1393
+     1393 unique property type identifier communication_properties.aadl:70:09
+      Identifier Node_Id 1392
+      1392 identifier communication_properties.aadl:70:11
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1392 record type element communication_properties.aadl:71:04
-     Identifier Node_Id 1393
-     1393 identifier communication_properties.aadl:71:04
-      Corresponding_Entity Node_Id 1392
+    1394 record type element communication_properties.aadl:71:04
+     Identifier Node_Id 1395
+     1395 identifier communication_properties.aadl:71:04
+      Corresponding_Entity Node_Id 1394
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1395
-     1395 unique property type identifier communication_properties.aadl:71:11
-      Identifier Node_Id 1394
-      1394 identifier communication_properties.aadl:71:13
+     Property_Type_Designator Node_Id 1397
+     1397 unique property type identifier communication_properties.aadl:71:11
+      Identifier Node_Id 1396
+      1396 identifier communication_properties.aadl:71:13
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1401
-  1401 applies to communication_properties.aadl:69:02
+  Applies_To Node_Id 1403
+  1403 applies to communication_properties.aadl:69:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1398
-   1399 named element communication_properties.aadl:72:15
+   Owner_Categories List_Id 1400
+   1401 named element communication_properties.aadl:72:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
- 1415 property definition declaration communication_properties.aadl:74:02
-  Identifier Node_Id 1403
-  1403 identifier communication_properties.aadl:74:02
-   Corresponding_Entity Node_Id 1415
+ 1417 property definition declaration communication_properties.aadl:74:02
+  Identifier Node_Id 1405
+  1405 identifier communication_properties.aadl:74:02
+   Corresponding_Entity Node_Id 1417
    Display_Name Name_Id "Actual_Latency"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1417
-  1417 property type communication_properties.aadl:74:02
+  Property_Name_Type Node_Id 1419
+  1419 property type communication_properties.aadl:74:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1405
-   1405 unique property type identifier communication_properties.aadl:74:16
-    Identifier Node_Id 1404
-    1404 identifier communication_properties.aadl:74:18
+   Property_Type_Designator Node_Id 1407
+   1407 unique property type identifier communication_properties.aadl:74:16
+    Identifier Node_Id 1406
+    1406 identifier communication_properties.aadl:74:18
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2655
-   2655 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2656
-    2656 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2657
-     2657 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2658
-      2658 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2659
-       2659 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2657
+   2657 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2658
+    2658 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2659
+     2659 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2660
+      2660 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2661
+       2661 literal timing_properties.aadl:7:25
         Value Value_Id 82
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2660
-      2660 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2661
-       2661 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2662
+      2662 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2663
+       2663 literal aadl_project.aadl:107:30
         Value Value_Id 83
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1416
-  1416 applies to communication_properties.aadl:74:02
+  Applies_To Node_Id 1418
+  1418 applies to communication_properties.aadl:74:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1407
-   1408 named element communication_properties.aadl:75:15
+   Owner_Categories List_Id 1409
+   1410 named element communication_properties.aadl:75:15
     Identifier Node_Id 0
     Category Byte 13
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1409 named element communication_properties.aadl:75:21
-    Identifier Node_Id 1410
-    1410 identifier communication_properties.aadl:75:21
+   1411 named element communication_properties.aadl:75:21
+    Identifier Node_Id 1412
+    1412 identifier communication_properties.aadl:75:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -7249,100 +7259,100 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1411 named element communication_properties.aadl:75:33
+   1413 named element communication_properties.aadl:75:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   1412 named element communication_properties.aadl:75:38
+   1414 named element communication_properties.aadl:75:38
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1413 named element communication_properties.aadl:75:49
+   1415 named element communication_properties.aadl:75:49
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   1414 named element communication_properties.aadl:75:57
+   1416 named element communication_properties.aadl:75:57
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1430 property definition declaration communication_properties.aadl:77:02
-  Identifier Node_Id 1418
-  1418 identifier communication_properties.aadl:77:02
-   Corresponding_Entity Node_Id 1430
+ 1432 property definition declaration communication_properties.aadl:77:02
+  Identifier Node_Id 1420
+  1420 identifier communication_properties.aadl:77:02
+   Corresponding_Entity Node_Id 1432
    Display_Name Name_Id "Latency"
-   Scope_Entity Node_Id 1071
+   Scope_Entity Node_Id 1073
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1432
-  1432 property type communication_properties.aadl:77:02
+  Property_Name_Type Node_Id 1434
+  1434 property type communication_properties.aadl:77:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1420
-   1420 unique property type identifier communication_properties.aadl:77:09
-    Identifier Node_Id 1419
-    1419 identifier communication_properties.aadl:77:11
+   Property_Type_Designator Node_Id 1422
+   1422 unique property type identifier communication_properties.aadl:77:09
+    Identifier Node_Id 1421
+    1421 identifier communication_properties.aadl:77:11
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2662
-   2662 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2663
-    2663 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2664
-     2664 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2665
-      2665 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2666
-       2666 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2664
+   2664 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2665
+    2665 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2666
+     2666 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2667
+      2667 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2668
+       2668 literal timing_properties.aadl:7:25
         Value Value_Id 84
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2667
-      2667 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2668
-       2668 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2669
+      2669 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2670
+       2670 literal aadl_project.aadl:107:30
         Value Value_Id 85
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1431
-  1431 applies to communication_properties.aadl:77:02
+  Applies_To Node_Id 1433
+  1433 applies to communication_properties.aadl:77:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1422
-   1423 named element communication_properties.aadl:78:15
+   Owner_Categories List_Id 1424
+   1425 named element communication_properties.aadl:78:15
     Identifier Node_Id 0
     Category Byte 13
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1424 named element communication_properties.aadl:78:21
-    Identifier Node_Id 1425
-    1425 identifier communication_properties.aadl:78:21
+   1426 named element communication_properties.aadl:78:21
+    Identifier Node_Id 1427
+    1427 identifier communication_properties.aadl:78:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -7350,152 +7360,152 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1426 named element communication_properties.aadl:78:33
+   1428 named element communication_properties.aadl:78:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   1427 named element communication_properties.aadl:78:38
+   1429 named element communication_properties.aadl:78:38
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1428 named element communication_properties.aadl:78:49
+   1430 named element communication_properties.aadl:78:49
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   1429 named element communication_properties.aadl:78:57
+   1431 named element communication_properties.aadl:78:57
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-1434 property set memory_properties.aadl:6:01
- Identifier Node_Id 1433
- 1433 identifier memory_properties.aadl:6:14
-  Corresponding_Entity Node_Id 1434
+1436 property set memory_properties.aadl:6:01
+ Identifier Node_Id 1435
+ 1435 identifier memory_properties.aadl:6:14
+  Corresponding_Entity Node_Id 1436
   Display_Name Name_Id "Memory_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 1435
- Declarations List_Id 1447
- 1446 property type declaration memory_properties.aadl:7:02
-  Identifier Node_Id 1436
-  1436 identifier memory_properties.aadl:7:02
-   Corresponding_Entity Node_Id 1446
+ Entity_Scope Node_Id 1437
+ Declarations List_Id 1449
+ 1448 property type declaration memory_properties.aadl:7:02
+  Identifier Node_Id 1438
+  1438 identifier memory_properties.aadl:7:02
+   Corresponding_Entity Node_Id 1448
    Display_Name Name_Id "Size"
-   Scope_Entity Node_Id 1435
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1437
-  1437 integer type memory_properties.aadl:7:13
-   Type_Range Node_Id 1443
-   1443 number range memory_properties.aadl:7:25
-    Lower_Bound Node_Id 1438
-    1438 signed aadlnumber memory_properties.aadl:7:25
-     Number_Value Node_Id 1439
-     1439 literal memory_properties.aadl:7:25
+   Scope_Entity Node_Id 1437
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1439
+  1439 integer type memory_properties.aadl:7:13
+   Type_Range Node_Id 1445
+   1445 number range memory_properties.aadl:7:25
+    Lower_Bound Node_Id 1440
+    1440 signed aadlnumber memory_properties.aadl:7:25
+     Number_Value Node_Id 1441
+     1441 literal memory_properties.aadl:7:25
       Value Value_Id 50
-     Unit_Identifier Node_Id 1440
-     1440 identifier memory_properties.aadl:7:27
-      Corresponding_Entity Node_Id 225
+     Unit_Identifier Node_Id 1442
+     1442 identifier memory_properties.aadl:7:27
+      Corresponding_Entity Node_Id 227
       Display_Name Name_Id "Bytes"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-    Upper_Bound Node_Id 1442
-    1442 property term memory_properties.aadl:7:33
-     Identifier Node_Id 1441
-     1441 identifier memory_properties.aadl:7:36
+    Upper_Bound Node_Id 1444
+    1444 property term memory_properties.aadl:7:33
+     Identifier Node_Id 1443
+     1443 identifier memory_properties.aadl:7:36
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Max_Memory_Size"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 180
+     Entity Node_Id 182
      Property_Set_Identifier Node_Id 0
-   Unit_Designator Node_Id 1445
-   1445 unique property type identifier memory_properties.aadl:7:52
-    Identifier Node_Id 1444
-    1444 identifier memory_properties.aadl:7:58
+   Unit_Designator Node_Id 1447
+   1447 unique property type identifier memory_properties.aadl:7:52
+    Identifier Node_Id 1446
+    1446 identifier memory_properties.aadl:7:58
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size_Units"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 244
+    Entity Node_Id 246
     Property_Set_Identifier Node_Id 0
- 1452 property type declaration memory_properties.aadl:9:02
-  Identifier Node_Id 1448
-  1448 identifier memory_properties.aadl:9:02
-   Corresponding_Entity Node_Id 1452
+ 1454 property type declaration memory_properties.aadl:9:02
+  Identifier Node_Id 1450
+  1450 identifier memory_properties.aadl:9:02
+   Corresponding_Entity Node_Id 1454
    Display_Name Name_Id "Size_Range"
-   Scope_Entity Node_Id 1435
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1449
-  1449 range type memory_properties.aadl:9:19
-   Number_Type Node_Id 1451
-   1451 unique property type identifier memory_properties.aadl:9:25
-    Identifier Node_Id 1450
-    1450 identifier memory_properties.aadl:9:28
+   Scope_Entity Node_Id 1437
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1451
+  1451 range type memory_properties.aadl:9:19
+   Number_Type Node_Id 1453
+   1453 unique property type identifier memory_properties.aadl:9:25
+    Identifier Node_Id 1452
+    1452 identifier memory_properties.aadl:9:28
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
- 1464 property definition declaration memory_properties.aadl:11:02
-  Identifier Node_Id 1453
-  1453 identifier memory_properties.aadl:11:02
-   Corresponding_Entity Node_Id 1464
+ 1466 property definition declaration memory_properties.aadl:11:02
+  Identifier Node_Id 1455
+  1455 identifier memory_properties.aadl:11:02
+   Corresponding_Entity Node_Id 1466
    Display_Name Name_Id "Access_Right"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1466
-  1466 property type memory_properties.aadl:11:02
+  Property_Name_Type Node_Id 1468
+  1468 property type memory_properties.aadl:11:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1455
-   1455 unique property type identifier memory_properties.aadl:11:14
-    Identifier Node_Id 1454
-    1454 identifier memory_properties.aadl:11:16
+   Property_Type_Designator Node_Id 1457
+   1457 unique property type identifier memory_properties.aadl:11:14
+    Identifier Node_Id 1456
+    1456 identifier memory_properties.aadl:11:16
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Access_Rights"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1475
+    Entity Node_Id 1477
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1469
-   1469 enumeration type memory_properties.aadl:14:22
-    Identifiers List_Id 1470
-    1471 identifier memory_properties.aadl:14:35
-     Corresponding_Entity Node_Id 1469
+   Expanded_Type_Designator Node_Id 1471
+   1471 enumeration type memory_properties.aadl:14:22
+    Identifiers List_Id 1472
+    1473 identifier memory_properties.aadl:14:35
+     Corresponding_Entity Node_Id 1471
      Display_Name Name_Id "read_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1472 identifier memory_properties.aadl:14:46
-     Corresponding_Entity Node_Id 1469
+    1474 identifier memory_properties.aadl:14:46
+     Corresponding_Entity Node_Id 1471
      Display_Name Name_Id "write_only"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1473 identifier memory_properties.aadl:14:58
-     Corresponding_Entity Node_Id 1469
+    1475 identifier memory_properties.aadl:14:58
+     Corresponding_Entity Node_Id 1471
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1474 identifier memory_properties.aadl:14:70
-     Corresponding_Entity Node_Id 1469
+    1476 identifier memory_properties.aadl:14:70
+     Corresponding_Entity Node_Id 1471
      Display_Name Name_Id "by_method"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-  Default_Value Node_Id 1467
-  1467 property value memory_properties.aadl:11:02
-   Value_Container Node_Id 1434
-   Single_Value Node_Id 2557
-   2557 enumeration term memory_properties.aadl:11:30
-    Identifier Node_Id 1456
-    1456 identifier memory_properties.aadl:11:33
+  Default_Value Node_Id 1469
+  1469 property value memory_properties.aadl:11:02
+   Value_Container Node_Id 1436
+   Single_Value Node_Id 2559
+   2559 enumeration term memory_properties.aadl:11:30
+    Identifier Node_Id 1458
+    1458 identifier memory_properties.aadl:11:33
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
@@ -7503,10 +7513,10 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2669
-   2669 enumeration term memory_properties.aadl:11:30
-    Identifier Node_Id 1456
-    1456 identifier memory_properties.aadl:11:33
+   Expanded_Single_Value Node_Id 2671
+   2671 enumeration term memory_properties.aadl:11:30
+    Identifier Node_Id 1458
+    1458 identifier memory_properties.aadl:11:33
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "read_write"
      Scope_Entity Node_Id 0
@@ -7514,1990 +7524,1990 @@ Declarations List_Id 7
     Entity Node_Id 0
     Property_Set_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1465
-  1465 applies to memory_properties.aadl:11:02
+  Applies_To Node_Id 1467
+  1467 applies to memory_properties.aadl:11:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1459
-   1460 named element memory_properties.aadl:12:15
+   Owner_Categories List_Id 1461
+   1462 named element memory_properties.aadl:12:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1461 named element memory_properties.aadl:12:21
+   1463 named element memory_properties.aadl:12:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   1462 named element memory_properties.aadl:12:26
+   1464 named element memory_properties.aadl:12:26
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1463 named element memory_properties.aadl:12:39
+   1465 named element memory_properties.aadl:12:39
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
- 1475 property type declaration memory_properties.aadl:14:02
-  Identifier Node_Id 1468
-  1468 identifier memory_properties.aadl:14:02
-   Corresponding_Entity Node_Id 1475
+ 1477 property type declaration memory_properties.aadl:14:02
+  Identifier Node_Id 1470
+  1470 identifier memory_properties.aadl:14:02
+   Corresponding_Entity Node_Id 1477
    Display_Name Name_Id "Access_Rights"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1469
-  1469 enumeration type memory_properties.aadl:14:22
-   Identifiers List_Id 1470
-   1471 identifier memory_properties.aadl:14:35
-    Corresponding_Entity Node_Id 1469
+  Property_Type_Designator Node_Id 1471
+  1471 enumeration type memory_properties.aadl:14:22
+   Identifiers List_Id 1472
+   1473 identifier memory_properties.aadl:14:35
+    Corresponding_Entity Node_Id 1471
     Display_Name Name_Id "read_only"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1472 identifier memory_properties.aadl:14:46
-    Corresponding_Entity Node_Id 1469
+   1474 identifier memory_properties.aadl:14:46
+    Corresponding_Entity Node_Id 1471
     Display_Name Name_Id "write_only"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1473 identifier memory_properties.aadl:14:58
-    Corresponding_Entity Node_Id 1469
+   1475 identifier memory_properties.aadl:14:58
+    Corresponding_Entity Node_Id 1471
     Display_Name Name_Id "read_write"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
-   1474 identifier memory_properties.aadl:14:70
-    Corresponding_Entity Node_Id 1469
+   1476 identifier memory_properties.aadl:14:70
+    Corresponding_Entity Node_Id 1471
     Display_Name Name_Id "by_method"
     Scope_Entity Node_Id 0
     Backend_Node Node_Id 0
    Enumeration_Context Node_Id 0
- 1526 property definition declaration memory_properties.aadl:16:02
-  Identifier Node_Id 1476
-  1476 identifier memory_properties.aadl:16:02
-   Corresponding_Entity Node_Id 1526
+ 1528 property definition declaration memory_properties.aadl:16:02
+  Identifier Node_Id 1478
+  1478 identifier memory_properties.aadl:16:02
+   Corresponding_Entity Node_Id 1528
    Display_Name Name_Id "Access_Time"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1528
-  1528 property type memory_properties.aadl:16:02
+  Property_Name_Type Node_Id 1530
+  1530 property type memory_properties.aadl:16:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1486
-   1486 record type memory_properties.aadl:16:22
-    List_Items List_Id 1477
-    1478 record type element memory_properties.aadl:17:03
-     Identifier Node_Id 1479
-     1479 identifier memory_properties.aadl:17:03
-      Corresponding_Entity Node_Id 1478
+   Property_Type_Designator Node_Id 1488
+   1488 record type memory_properties.aadl:16:22
+    List_Items List_Id 1479
+    1480 record type element memory_properties.aadl:17:03
+     Identifier Node_Id 1481
+     1481 identifier memory_properties.aadl:17:03
+      Corresponding_Entity Node_Id 1480
       Display_Name Name_Id "First"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1481
-     1481 unique property type identifier memory_properties.aadl:17:08
-      Identifier Node_Id 1480
-      1480 identifier memory_properties.aadl:17:10
+     Property_Type_Designator Node_Id 1483
+     1483 unique property type identifier memory_properties.aadl:17:08
+      Identifier Node_Id 1482
+      1482 identifier memory_properties.aadl:17:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "IO_Time_Spec"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1278
+      Entity Node_Id 1280
       Property_Set_Identifier Node_Id 0
-    1482 record type element memory_properties.aadl:18:03
-     Identifier Node_Id 1483
-     1483 identifier memory_properties.aadl:18:03
-      Corresponding_Entity Node_Id 1482
+    1484 record type element memory_properties.aadl:18:03
+     Identifier Node_Id 1485
+     1485 identifier memory_properties.aadl:18:03
+      Corresponding_Entity Node_Id 1484
       Display_Name Name_Id "Last"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1485
-     1485 unique property type identifier memory_properties.aadl:18:07
-      Identifier Node_Id 1484
-      1484 identifier memory_properties.aadl:18:09
+     Property_Type_Designator Node_Id 1487
+     1487 unique property type identifier memory_properties.aadl:18:07
+      Identifier Node_Id 1486
+      1486 identifier memory_properties.aadl:18:09
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "IO_Time_Spec"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1278
+      Entity Node_Id 1280
       Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1486
-   1486 record type memory_properties.aadl:16:22
-    List_Items List_Id 1477
-    1478 record type element memory_properties.aadl:17:03
-     Identifier Node_Id 1479
-     1479 identifier memory_properties.aadl:17:03
-      Corresponding_Entity Node_Id 1478
+   Expanded_Type_Designator Node_Id 1488
+   1488 record type memory_properties.aadl:16:22
+    List_Items List_Id 1479
+    1480 record type element memory_properties.aadl:17:03
+     Identifier Node_Id 1481
+     1481 identifier memory_properties.aadl:17:03
+      Corresponding_Entity Node_Id 1480
       Display_Name Name_Id "First"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1481
-     1481 unique property type identifier memory_properties.aadl:17:08
-      Identifier Node_Id 1480
-      1480 identifier memory_properties.aadl:17:10
+     Property_Type_Designator Node_Id 1483
+     1483 unique property type identifier memory_properties.aadl:17:08
+      Identifier Node_Id 1482
+      1482 identifier memory_properties.aadl:17:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "IO_Time_Spec"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1278
+      Entity Node_Id 1280
       Property_Set_Identifier Node_Id 0
-    1482 record type element memory_properties.aadl:18:03
-     Identifier Node_Id 1483
-     1483 identifier memory_properties.aadl:18:03
-      Corresponding_Entity Node_Id 1482
+    1484 record type element memory_properties.aadl:18:03
+     Identifier Node_Id 1485
+     1485 identifier memory_properties.aadl:18:03
+      Corresponding_Entity Node_Id 1484
       Display_Name Name_Id "Last"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1485
-     1485 unique property type identifier memory_properties.aadl:18:07
-      Identifier Node_Id 1484
-      1484 identifier memory_properties.aadl:18:09
+     Property_Type_Designator Node_Id 1487
+     1487 unique property type identifier memory_properties.aadl:18:07
+      Identifier Node_Id 1486
+      1486 identifier memory_properties.aadl:18:09
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "IO_Time_Spec"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1278
+      Entity Node_Id 1280
       Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1529
-  1529 property value memory_properties.aadl:16:02
-   Value_Container Node_Id 1434
-   Single_Value Node_Id 1487
-   1487 record term memory_properties.aadl:19:06
-    List_Items List_Id 1488
-    1489 record term element memory_properties.aadl:19:08
-     Identifier Node_Id 1490
-     1490 identifier memory_properties.aadl:19:08
-      Corresponding_Entity Node_Id 1489
+  Default_Value Node_Id 1531
+  1531 property value memory_properties.aadl:16:02
+   Value_Container Node_Id 1436
+   Single_Value Node_Id 1489
+   1489 record term memory_properties.aadl:19:06
+    List_Items List_Id 1490
+    1491 record term element memory_properties.aadl:19:08
+     Identifier Node_Id 1492
+     1492 identifier memory_properties.aadl:19:08
+      Corresponding_Entity Node_Id 1491
       Display_Name Name_Id "First"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1491
-     1491 record term memory_properties.aadl:19:17
-      List_Items List_Id 1492
-      1493 record term element memory_properties.aadl:19:19
-       Identifier Node_Id 1494
-       1494 identifier memory_properties.aadl:19:19
-        Corresponding_Entity Node_Id 1493
+     Property_Expression Node_Id 1493
+     1493 record term memory_properties.aadl:19:17
+      List_Items List_Id 1494
+      1495 record term element memory_properties.aadl:19:19
+       Identifier Node_Id 1496
+       1496 identifier memory_properties.aadl:19:19
+        Corresponding_Entity Node_Id 1495
         Display_Name Name_Id "Time"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-       Property_Expression Node_Id 1496
-       1496 property term memory_properties.aadl:19:24
-        Identifier Node_Id 1495
-        1495 identifier memory_properties.aadl:19:27
+       Property_Expression Node_Id 1498
+       1498 property term memory_properties.aadl:19:24
+        Identifier Node_Id 1497
+        1497 identifier memory_properties.aadl:19:27
          Corresponding_Entity Node_Id 0
          Display_Name Name_Id "Start"
          Scope_Entity Node_Id 0
          Backend_Node Node_Id 0
-        Entity Node_Id 1493
+        Entity Node_Id 1495
         Property_Set_Identifier Node_Id 0
-      1497 record term element memory_properties.aadl:19:34
-       Identifier Node_Id 1498
-       1498 identifier memory_properties.aadl:19:34
-        Corresponding_Entity Node_Id 1497
+      1499 record term element memory_properties.aadl:19:34
+       Identifier Node_Id 1500
+       1500 identifier memory_properties.aadl:19:34
+        Corresponding_Entity Node_Id 1499
         Display_Name Name_Id "Offset"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-       Property_Expression Node_Id 1505
-       1505 number range term memory_properties.aadl:19:44
-        Lower_Bound Node_Id 1499
-        1499 signed aadlnumber memory_properties.aadl:19:44
-         Number_Value Node_Id 1500
-         1500 literal memory_properties.aadl:19:44
+       Property_Expression Node_Id 1507
+       1507 number range term memory_properties.aadl:19:44
+        Lower_Bound Node_Id 1501
+        1501 signed aadlnumber memory_properties.aadl:19:44
+         Number_Value Node_Id 1502
+         1502 literal memory_properties.aadl:19:44
           Value Value_Id 51
-         Unit_Identifier Node_Id 1501
-         1501 identifier memory_properties.aadl:19:46
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1503
+         1503 identifier memory_properties.aadl:19:46
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
-        Upper_Bound Node_Id 1502
-        1502 signed aadlnumber memory_properties.aadl:19:52
-         Number_Value Node_Id 1503
-         1503 literal memory_properties.aadl:19:52
+        Upper_Bound Node_Id 1504
+        1504 signed aadlnumber memory_properties.aadl:19:52
+         Number_Value Node_Id 1505
+         1505 literal memory_properties.aadl:19:52
           Value Value_Id 52
-         Unit_Identifier Node_Id 1504
-         1504 identifier memory_properties.aadl:19:54
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1506
+         1506 identifier memory_properties.aadl:19:54
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
         Delta_Term Node_Id 0
-    1506 record term element memory_properties.aadl:20:04
-     Identifier Node_Id 1507
-     1507 identifier memory_properties.aadl:20:04
-      Corresponding_Entity Node_Id 1506
+    1508 record term element memory_properties.aadl:20:04
+     Identifier Node_Id 1509
+     1509 identifier memory_properties.aadl:20:04
+      Corresponding_Entity Node_Id 1508
       Display_Name Name_Id "Last"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 1508
-     1508 record term memory_properties.aadl:20:12
-      List_Items List_Id 1509
-      1510 record term element memory_properties.aadl:20:14
-       Identifier Node_Id 1511
-       1511 identifier memory_properties.aadl:20:14
-        Corresponding_Entity Node_Id 1510
+     Property_Expression Node_Id 1510
+     1510 record term memory_properties.aadl:20:12
+      List_Items List_Id 1511
+      1512 record term element memory_properties.aadl:20:14
+       Identifier Node_Id 1513
+       1513 identifier memory_properties.aadl:20:14
+        Corresponding_Entity Node_Id 1512
         Display_Name Name_Id "Time"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-       Property_Expression Node_Id 1513
-       1513 property term memory_properties.aadl:20:19
-        Identifier Node_Id 1512
-        1512 identifier memory_properties.aadl:20:22
+       Property_Expression Node_Id 1515
+       1515 property term memory_properties.aadl:20:19
+        Identifier Node_Id 1514
+        1514 identifier memory_properties.aadl:20:22
          Corresponding_Entity Node_Id 0
          Display_Name Name_Id "Completion"
          Scope_Entity Node_Id 0
          Backend_Node Node_Id 0
-        Entity Node_Id 1510
+        Entity Node_Id 1512
         Property_Set_Identifier Node_Id 0
-      1514 record term element memory_properties.aadl:20:34
-       Identifier Node_Id 1515
-       1515 identifier memory_properties.aadl:20:34
-        Corresponding_Entity Node_Id 1514
+      1516 record term element memory_properties.aadl:20:34
+       Identifier Node_Id 1517
+       1517 identifier memory_properties.aadl:20:34
+        Corresponding_Entity Node_Id 1516
         Display_Name Name_Id "Offset"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-       Property_Expression Node_Id 1522
-       1522 number range term memory_properties.aadl:20:44
-        Lower_Bound Node_Id 1516
-        1516 signed aadlnumber memory_properties.aadl:20:44
-         Number_Value Node_Id 1517
-         1517 literal memory_properties.aadl:20:44
+       Property_Expression Node_Id 1524
+       1524 number range term memory_properties.aadl:20:44
+        Lower_Bound Node_Id 1518
+        1518 signed aadlnumber memory_properties.aadl:20:44
+         Number_Value Node_Id 1519
+         1519 literal memory_properties.aadl:20:44
           Value Value_Id 53
-         Unit_Identifier Node_Id 1518
-         1518 identifier memory_properties.aadl:20:46
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1520
+         1520 identifier memory_properties.aadl:20:46
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
-        Upper_Bound Node_Id 1519
-        1519 signed aadlnumber memory_properties.aadl:20:52
-         Number_Value Node_Id 1520
-         1520 literal memory_properties.aadl:20:52
+        Upper_Bound Node_Id 1521
+        1521 signed aadlnumber memory_properties.aadl:20:52
+         Number_Value Node_Id 1522
+         1522 literal memory_properties.aadl:20:52
           Value Value_Id 54
-         Unit_Identifier Node_Id 1521
-         1521 identifier memory_properties.aadl:20:54
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1523
+         1523 identifier memory_properties.aadl:20:54
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
         Delta_Term Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2670
-   2670 record term memory_properties.aadl:19:06
-    List_Items List_Id 2671
-    2672 record term element memory_properties.aadl:19:06
-     Identifier Node_Id 1490
-     1490 identifier memory_properties.aadl:19:08
-      Corresponding_Entity Node_Id 1489
+   Expanded_Single_Value Node_Id 2672
+   2672 record term memory_properties.aadl:19:06
+    List_Items List_Id 2673
+    2674 record term element memory_properties.aadl:19:06
+     Identifier Node_Id 1492
+     1492 identifier memory_properties.aadl:19:08
+      Corresponding_Entity Node_Id 1491
       Display_Name Name_Id "First"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2673
-     2673 record term memory_properties.aadl:19:17
-      List_Items List_Id 2674
-      2675 record term element memory_properties.aadl:19:17
-       Identifier Node_Id 1494
-       1494 identifier memory_properties.aadl:19:19
-        Corresponding_Entity Node_Id 1493
+     Property_Expression Node_Id 2675
+     2675 record term memory_properties.aadl:19:17
+      List_Items List_Id 2676
+      2677 record term element memory_properties.aadl:19:17
+       Identifier Node_Id 1496
+       1496 identifier memory_properties.aadl:19:19
+        Corresponding_Entity Node_Id 1495
         Display_Name Name_Id "Time"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
        Property_Expression Node_Id 0
-      2676 record term element memory_properties.aadl:19:17
-       Identifier Node_Id 1498
-       1498 identifier memory_properties.aadl:19:34
-        Corresponding_Entity Node_Id 1497
+      2678 record term element memory_properties.aadl:19:17
+       Identifier Node_Id 1500
+       1500 identifier memory_properties.aadl:19:34
+        Corresponding_Entity Node_Id 1499
         Display_Name Name_Id "Offset"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-       Property_Expression Node_Id 2677
-       2677 number range term memory_properties.aadl:19:44
-        Lower_Bound Node_Id 2678
-        2678 signed aadlnumber memory_properties.aadl:19:44
-         Number_Value Node_Id 2679
-         2679 literal memory_properties.aadl:19:44
+       Property_Expression Node_Id 2679
+       2679 number range term memory_properties.aadl:19:44
+        Lower_Bound Node_Id 2680
+        2680 signed aadlnumber memory_properties.aadl:19:44
+         Number_Value Node_Id 2681
+         2681 literal memory_properties.aadl:19:44
           Value Value_Id 86
-         Unit_Identifier Node_Id 1501
-         1501 identifier memory_properties.aadl:19:46
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1503
+         1503 identifier memory_properties.aadl:19:46
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
-        Upper_Bound Node_Id 2680
-        2680 signed aadlnumber memory_properties.aadl:19:52
-         Number_Value Node_Id 2681
-         2681 literal memory_properties.aadl:19:52
+        Upper_Bound Node_Id 2682
+        2682 signed aadlnumber memory_properties.aadl:19:52
+         Number_Value Node_Id 2683
+         2683 literal memory_properties.aadl:19:52
           Value Value_Id 87
-         Unit_Identifier Node_Id 1504
-         1504 identifier memory_properties.aadl:19:54
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1506
+         1506 identifier memory_properties.aadl:19:54
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
         Delta_Term Node_Id 0
-    2682 record term element memory_properties.aadl:19:06
-     Identifier Node_Id 1507
-     1507 identifier memory_properties.aadl:20:04
-      Corresponding_Entity Node_Id 1506
+    2684 record term element memory_properties.aadl:19:06
+     Identifier Node_Id 1509
+     1509 identifier memory_properties.aadl:20:04
+      Corresponding_Entity Node_Id 1508
       Display_Name Name_Id "Last"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Property_Expression Node_Id 2683
-     2683 record term memory_properties.aadl:20:12
-      List_Items List_Id 2684
-      2685 record term element memory_properties.aadl:20:12
-       Identifier Node_Id 1511
-       1511 identifier memory_properties.aadl:20:14
-        Corresponding_Entity Node_Id 1510
+     Property_Expression Node_Id 2685
+     2685 record term memory_properties.aadl:20:12
+      List_Items List_Id 2686
+      2687 record term element memory_properties.aadl:20:12
+       Identifier Node_Id 1513
+       1513 identifier memory_properties.aadl:20:14
+        Corresponding_Entity Node_Id 1512
         Display_Name Name_Id "Time"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
        Property_Expression Node_Id 0
-      2686 record term element memory_properties.aadl:20:12
-       Identifier Node_Id 1515
-       1515 identifier memory_properties.aadl:20:34
-        Corresponding_Entity Node_Id 1514
+      2688 record term element memory_properties.aadl:20:12
+       Identifier Node_Id 1517
+       1517 identifier memory_properties.aadl:20:34
+        Corresponding_Entity Node_Id 1516
         Display_Name Name_Id "Offset"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-       Property_Expression Node_Id 2687
-       2687 number range term memory_properties.aadl:20:44
-        Lower_Bound Node_Id 2688
-        2688 signed aadlnumber memory_properties.aadl:20:44
-         Number_Value Node_Id 2689
-         2689 literal memory_properties.aadl:20:44
+       Property_Expression Node_Id 2689
+       2689 number range term memory_properties.aadl:20:44
+        Lower_Bound Node_Id 2690
+        2690 signed aadlnumber memory_properties.aadl:20:44
+         Number_Value Node_Id 2691
+         2691 literal memory_properties.aadl:20:44
           Value Value_Id 88
-         Unit_Identifier Node_Id 1518
-         1518 identifier memory_properties.aadl:20:46
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1520
+         1520 identifier memory_properties.aadl:20:46
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
-        Upper_Bound Node_Id 2690
-        2690 signed aadlnumber memory_properties.aadl:20:52
-         Number_Value Node_Id 2691
-         2691 literal memory_properties.aadl:20:52
+        Upper_Bound Node_Id 2692
+        2692 signed aadlnumber memory_properties.aadl:20:52
+         Number_Value Node_Id 2693
+         2693 literal memory_properties.aadl:20:52
           Value Value_Id 89
-         Unit_Identifier Node_Id 1521
-         1521 identifier memory_properties.aadl:20:54
-          Corresponding_Entity Node_Id 250
+         Unit_Identifier Node_Id 1523
+         1523 identifier memory_properties.aadl:20:54
+          Corresponding_Entity Node_Id 252
           Display_Name Name_Id "ns"
           Scope_Entity Node_Id 0
           Backend_Node Node_Id 0
         Delta_Term Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1527
-  1527 applies to memory_properties.aadl:16:02
+  Applies_To Node_Id 1529
+  1529 applies to memory_properties.aadl:16:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1524
-   1525 named element memory_properties.aadl:21:37
+   Owner_Categories List_Id 1526
+   1527 named element memory_properties.aadl:21:37
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
- 1536 property definition declaration memory_properties.aadl:23:02
-  Identifier Node_Id 1530
-  1530 identifier memory_properties.aadl:23:02
-   Corresponding_Entity Node_Id 1536
+ 1538 property definition declaration memory_properties.aadl:23:02
+  Identifier Node_Id 1532
+  1532 identifier memory_properties.aadl:23:02
+   Corresponding_Entity Node_Id 1538
    Display_Name Name_Id "Allowed_Message_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1538
-  1538 property type memory_properties.aadl:23:02
+  Property_Name_Type Node_Id 1540
+  1540 property type memory_properties.aadl:23:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1532
-   1532 unique property type identifier memory_properties.aadl:23:22
-    Identifier Node_Id 1531
-    1531 identifier memory_properties.aadl:23:24
+   Property_Type_Designator Node_Id 1534
+   1534 unique property type identifier memory_properties.aadl:23:22
+    Identifier Node_Id 1533
+    1533 identifier memory_properties.aadl:23:24
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1452
+    Entity Node_Id 1454
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2692
-   2692 range type memory_properties.aadl:9:19
-    Number_Type Node_Id 2693
-    2693 integer type memory_properties.aadl:7:13
-     Type_Range Node_Id 2694
-     2694 number range memory_properties.aadl:7:25
-      Lower_Bound Node_Id 2695
-      2695 signed aadlnumber memory_properties.aadl:7:25
-       Number_Value Node_Id 2696
-       2696 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2694
+   2694 range type memory_properties.aadl:9:19
+    Number_Type Node_Id 2695
+    2695 integer type memory_properties.aadl:7:13
+     Type_Range Node_Id 2696
+     2696 number range memory_properties.aadl:7:25
+      Lower_Bound Node_Id 2697
+      2697 signed aadlnumber memory_properties.aadl:7:25
+       Number_Value Node_Id 2698
+       2698 literal memory_properties.aadl:7:25
         Value Value_Id 90
-       Unit_Identifier Node_Id 1440
-       1440 identifier memory_properties.aadl:7:27
-        Corresponding_Entity Node_Id 225
+       Unit_Identifier Node_Id 1442
+       1442 identifier memory_properties.aadl:7:27
+        Corresponding_Entity Node_Id 227
         Display_Name Name_Id "Bytes"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2697
-      2697 signed aadlnumber aadl_project.aadl:99:37
-       Number_Value Node_Id 2698
-       2698 literal aadl_project.aadl:99:37
+      Upper_Bound Node_Id 2699
+      2699 signed aadlnumber aadl_project.aadl:101:37
+       Number_Value Node_Id 2700
+       2700 literal aadl_project.aadl:101:37
         Value Value_Id 91
-       Unit_Identifier Node_Id 179
-       179 identifier aadl_project.aadl:99:45
-        Corresponding_Entity Node_Id 225
+       Unit_Identifier Node_Id 181
+       181 identifier aadl_project.aadl:101:45
+        Corresponding_Entity Node_Id 227
         Display_Name Name_Id "Bytes"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1445
-     1445 unique property type identifier memory_properties.aadl:7:52
-      Identifier Node_Id 1444
-      1444 identifier memory_properties.aadl:7:58
+     Unit_Designator Node_Id 1447
+     1447 unique property type identifier memory_properties.aadl:7:52
+      Identifier Node_Id 1446
+      1446 identifier memory_properties.aadl:7:58
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Size_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 244
+      Entity Node_Id 246
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1537
-  1537 applies to memory_properties.aadl:23:02
+  Applies_To Node_Id 1539
+  1539 applies to memory_properties.aadl:23:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1534
-   1535 named element memory_properties.aadl:24:15
+   Owner_Categories List_Id 1536
+   1537 named element memory_properties.aadl:24:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
- 1553 property definition declaration memory_properties.aadl:26:02
-  Identifier Node_Id 1539
-  1539 identifier memory_properties.aadl:26:02
-   Corresponding_Entity Node_Id 1553
+ 1555 property definition declaration memory_properties.aadl:26:02
+  Identifier Node_Id 1541
+  1541 identifier memory_properties.aadl:26:02
+   Corresponding_Entity Node_Id 1555
    Display_Name Name_Id "Assign_Time"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1555
-  1555 property type memory_properties.aadl:26:02
+  Property_Name_Type Node_Id 1557
+  1557 property type memory_properties.aadl:26:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1549
-   1549 record type memory_properties.aadl:26:22
-    List_Items List_Id 1540
-    1541 record type element memory_properties.aadl:27:03
-     Identifier Node_Id 1542
-     1542 identifier memory_properties.aadl:27:03
-      Corresponding_Entity Node_Id 1541
+   Property_Type_Designator Node_Id 1551
+   1551 record type memory_properties.aadl:26:22
+    List_Items List_Id 1542
+    1543 record type element memory_properties.aadl:27:03
+     Identifier Node_Id 1544
+     1544 identifier memory_properties.aadl:27:03
+      Corresponding_Entity Node_Id 1543
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1544
-     1544 unique property type identifier memory_properties.aadl:27:08
-      Identifier Node_Id 1543
-      1543 identifier memory_properties.aadl:27:10
+     Property_Type_Designator Node_Id 1546
+     1546 unique property type identifier memory_properties.aadl:27:08
+      Identifier Node_Id 1545
+      1545 identifier memory_properties.aadl:27:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1545 record type element memory_properties.aadl:28:03
-     Identifier Node_Id 1546
-     1546 identifier memory_properties.aadl:28:03
-      Corresponding_Entity Node_Id 1545
+    1547 record type element memory_properties.aadl:28:03
+     Identifier Node_Id 1548
+     1548 identifier memory_properties.aadl:28:03
+      Corresponding_Entity Node_Id 1547
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1548
-     1548 unique property type identifier memory_properties.aadl:28:10
-      Identifier Node_Id 1547
-      1547 identifier memory_properties.aadl:28:12
+     Property_Type_Designator Node_Id 1550
+     1550 unique property type identifier memory_properties.aadl:28:10
+      Identifier Node_Id 1549
+      1549 identifier memory_properties.aadl:28:12
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1549
-   1549 record type memory_properties.aadl:26:22
-    List_Items List_Id 1540
-    1541 record type element memory_properties.aadl:27:03
-     Identifier Node_Id 1542
-     1542 identifier memory_properties.aadl:27:03
-      Corresponding_Entity Node_Id 1541
+   Expanded_Type_Designator Node_Id 1551
+   1551 record type memory_properties.aadl:26:22
+    List_Items List_Id 1542
+    1543 record type element memory_properties.aadl:27:03
+     Identifier Node_Id 1544
+     1544 identifier memory_properties.aadl:27:03
+      Corresponding_Entity Node_Id 1543
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1544
-     1544 unique property type identifier memory_properties.aadl:27:08
-      Identifier Node_Id 1543
-      1543 identifier memory_properties.aadl:27:10
+     Property_Type_Designator Node_Id 1546
+     1546 unique property type identifier memory_properties.aadl:27:08
+      Identifier Node_Id 1545
+      1545 identifier memory_properties.aadl:27:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1545 record type element memory_properties.aadl:28:03
-     Identifier Node_Id 1546
-     1546 identifier memory_properties.aadl:28:03
-      Corresponding_Entity Node_Id 1545
+    1547 record type element memory_properties.aadl:28:03
+     Identifier Node_Id 1548
+     1548 identifier memory_properties.aadl:28:03
+      Corresponding_Entity Node_Id 1547
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1548
-     1548 unique property type identifier memory_properties.aadl:28:10
-      Identifier Node_Id 1547
-      1547 identifier memory_properties.aadl:28:12
+     Property_Type_Designator Node_Id 1550
+     1550 unique property type identifier memory_properties.aadl:28:10
+      Identifier Node_Id 1549
+      1549 identifier memory_properties.aadl:28:12
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1554
-  1554 applies to memory_properties.aadl:26:02
+  Applies_To Node_Id 1556
+  1556 applies to memory_properties.aadl:26:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1551
-   1552 named element memory_properties.aadl:29:15
+   Owner_Categories List_Id 1553
+   1554 named element memory_properties.aadl:29:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 1569 property definition declaration memory_properties.aadl:31:02
-  Identifier Node_Id 1556
-  1556 identifier memory_properties.aadl:31:02
-   Corresponding_Entity Node_Id 1569
+ 1571 property definition declaration memory_properties.aadl:31:02
+  Identifier Node_Id 1558
+  1558 identifier memory_properties.aadl:31:02
+   Corresponding_Entity Node_Id 1571
    Display_Name Name_Id "Base_Address"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1571
-  1571 property type memory_properties.aadl:31:02
+  Property_Name_Type Node_Id 1573
+  1573 property type memory_properties.aadl:31:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1557
-   1557 integer type memory_properties.aadl:31:16
-    Type_Range Node_Id 1562
-    1562 number range memory_properties.aadl:31:28
-     Lower_Bound Node_Id 1558
-     1558 signed aadlnumber memory_properties.aadl:31:28
-      Number_Value Node_Id 1559
-      1559 literal memory_properties.aadl:31:28
+   Property_Type_Designator Node_Id 1559
+   1559 integer type memory_properties.aadl:31:16
+    Type_Range Node_Id 1564
+    1564 number range memory_properties.aadl:31:28
+     Lower_Bound Node_Id 1560
+     1560 signed aadlnumber memory_properties.aadl:31:28
+      Number_Value Node_Id 1561
+      1561 literal memory_properties.aadl:31:28
        Value Value_Id 55
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 1561
-     1561 property term memory_properties.aadl:31:30
-      Identifier Node_Id 1560
-      1560 identifier memory_properties.aadl:31:33
+     Upper_Bound Node_Id 1563
+     1563 property term memory_properties.aadl:31:30
+      Identifier Node_Id 1562
+      1562 identifier memory_properties.aadl:31:33
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Max_Base_Address"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 172
+      Entity Node_Id 174
       Property_Set_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2699
-   2699 integer type memory_properties.aadl:31:16
-    Type_Range Node_Id 2700
-    2700 number range memory_properties.aadl:31:28
-     Lower_Bound Node_Id 2701
-     2701 signed aadlnumber memory_properties.aadl:31:28
-      Number_Value Node_Id 2702
-      2702 literal memory_properties.aadl:31:28
+   Expanded_Type_Designator Node_Id 2701
+   2701 integer type memory_properties.aadl:31:16
+    Type_Range Node_Id 2702
+    2702 number range memory_properties.aadl:31:28
+     Lower_Bound Node_Id 2703
+     2703 signed aadlnumber memory_properties.aadl:31:28
+      Number_Value Node_Id 2704
+      2704 literal memory_properties.aadl:31:28
        Value Value_Id 92
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 2703
-     2703 signed aadlnumber aadl_project.aadl:97:45
-      Number_Value Node_Id 2704
-      2704 literal aadl_project.aadl:97:45
+     Upper_Bound Node_Id 2705
+     2705 signed aadlnumber aadl_project.aadl:99:45
+      Number_Value Node_Id 2706
+      2706 literal aadl_project.aadl:99:45
        Value Value_Id 93
       Unit_Identifier Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1570
-  1570 applies to memory_properties.aadl:31:02
+  Applies_To Node_Id 1572
+  1572 applies to memory_properties.aadl:31:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1564
-   1565 named element memory_properties.aadl:32:15
+   Owner_Categories List_Id 1566
+   1567 named element memory_properties.aadl:32:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   1566 named element memory_properties.aadl:32:23
+   1568 named element memory_properties.aadl:32:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1567 named element memory_properties.aadl:32:29
+   1569 named element memory_properties.aadl:32:29
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1568 named element memory_properties.aadl:32:42
+   1570 named element memory_properties.aadl:32:42
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1578 property definition declaration memory_properties.aadl:34:02
-  Identifier Node_Id 1572
-  1572 identifier memory_properties.aadl:34:02
-   Corresponding_Entity Node_Id 1578
+ 1580 property definition declaration memory_properties.aadl:34:02
+  Identifier Node_Id 1574
+  1574 identifier memory_properties.aadl:34:02
+   Corresponding_Entity Node_Id 1580
    Display_Name Name_Id "Device_Register_Address"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1580
-  1580 property type memory_properties.aadl:34:02
+  Property_Name_Type Node_Id 1582
+  1582 property type memory_properties.aadl:34:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1573
-   1573 integer type memory_properties.aadl:34:27
+   Property_Type_Designator Node_Id 1575
+   1575 integer type memory_properties.aadl:34:27
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2705
-   2705 integer type memory_properties.aadl:34:27
+   Expanded_Type_Designator Node_Id 2707
+   2707 integer type memory_properties.aadl:34:27
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1579
-  1579 applies to memory_properties.aadl:34:02
+  Applies_To Node_Id 1581
+  1581 applies to memory_properties.aadl:34:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1575
-   1576 named element memory_properties.aadl:35:15
+   Owner_Categories List_Id 1577
+   1578 named element memory_properties.aadl:35:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1577 named element memory_properties.aadl:35:21
+   1579 named element memory_properties.aadl:35:21
     Identifier Node_Id 0
     Category Byte 33
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1595 property definition declaration memory_properties.aadl:37:02
-  Identifier Node_Id 1581
-  1581 identifier memory_properties.aadl:37:02
-   Corresponding_Entity Node_Id 1595
+ 1597 property definition declaration memory_properties.aadl:37:02
+  Identifier Node_Id 1583
+  1583 identifier memory_properties.aadl:37:02
+   Corresponding_Entity Node_Id 1597
    Display_Name Name_Id "Read_Time"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1597
-  1597 property type memory_properties.aadl:37:02
+  Property_Name_Type Node_Id 1599
+  1599 property type memory_properties.aadl:37:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1591
-   1591 record type memory_properties.aadl:37:20
-    List_Items List_Id 1582
-    1583 record type element memory_properties.aadl:38:03
-     Identifier Node_Id 1584
-     1584 identifier memory_properties.aadl:38:03
-      Corresponding_Entity Node_Id 1583
+   Property_Type_Designator Node_Id 1593
+   1593 record type memory_properties.aadl:37:20
+    List_Items List_Id 1584
+    1585 record type element memory_properties.aadl:38:03
+     Identifier Node_Id 1586
+     1586 identifier memory_properties.aadl:38:03
+      Corresponding_Entity Node_Id 1585
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1586
-     1586 unique property type identifier memory_properties.aadl:38:08
-      Identifier Node_Id 1585
-      1585 identifier memory_properties.aadl:38:10
+     Property_Type_Designator Node_Id 1588
+     1588 unique property type identifier memory_properties.aadl:38:08
+      Identifier Node_Id 1587
+      1587 identifier memory_properties.aadl:38:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1587 record type element memory_properties.aadl:39:03
-     Identifier Node_Id 1588
-     1588 identifier memory_properties.aadl:39:03
-      Corresponding_Entity Node_Id 1587
+    1589 record type element memory_properties.aadl:39:03
+     Identifier Node_Id 1590
+     1590 identifier memory_properties.aadl:39:03
+      Corresponding_Entity Node_Id 1589
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1590
-     1590 unique property type identifier memory_properties.aadl:39:10
-      Identifier Node_Id 1589
-      1589 identifier memory_properties.aadl:39:12
+     Property_Type_Designator Node_Id 1592
+     1592 unique property type identifier memory_properties.aadl:39:10
+      Identifier Node_Id 1591
+      1591 identifier memory_properties.aadl:39:12
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1591
-   1591 record type memory_properties.aadl:37:20
-    List_Items List_Id 1582
-    1583 record type element memory_properties.aadl:38:03
-     Identifier Node_Id 1584
-     1584 identifier memory_properties.aadl:38:03
-      Corresponding_Entity Node_Id 1583
+   Expanded_Type_Designator Node_Id 1593
+   1593 record type memory_properties.aadl:37:20
+    List_Items List_Id 1584
+    1585 record type element memory_properties.aadl:38:03
+     Identifier Node_Id 1586
+     1586 identifier memory_properties.aadl:38:03
+      Corresponding_Entity Node_Id 1585
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1586
-     1586 unique property type identifier memory_properties.aadl:38:08
-      Identifier Node_Id 1585
-      1585 identifier memory_properties.aadl:38:10
+     Property_Type_Designator Node_Id 1588
+     1588 unique property type identifier memory_properties.aadl:38:08
+      Identifier Node_Id 1587
+      1587 identifier memory_properties.aadl:38:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1587 record type element memory_properties.aadl:39:03
-     Identifier Node_Id 1588
-     1588 identifier memory_properties.aadl:39:03
-      Corresponding_Entity Node_Id 1587
+    1589 record type element memory_properties.aadl:39:03
+     Identifier Node_Id 1590
+     1590 identifier memory_properties.aadl:39:03
+      Corresponding_Entity Node_Id 1589
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1590
-     1590 unique property type identifier memory_properties.aadl:39:10
-      Identifier Node_Id 1589
-      1589 identifier memory_properties.aadl:39:12
+     Property_Type_Designator Node_Id 1592
+     1592 unique property type identifier memory_properties.aadl:39:10
+      Identifier Node_Id 1591
+      1591 identifier memory_properties.aadl:39:12
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1596
-  1596 applies to memory_properties.aadl:37:02
+  Applies_To Node_Id 1598
+  1598 applies to memory_properties.aadl:37:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1593
-   1594 named element memory_properties.aadl:40:15
+   Owner_Categories List_Id 1595
+   1596 named element memory_properties.aadl:40:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 1611 property definition declaration memory_properties.aadl:42:02
-  Identifier Node_Id 1598
-  1598 identifier memory_properties.aadl:42:02
-   Corresponding_Entity Node_Id 1611
+ 1613 property definition declaration memory_properties.aadl:42:02
+  Identifier Node_Id 1600
+  1600 identifier memory_properties.aadl:42:02
+   Corresponding_Entity Node_Id 1613
    Display_Name Name_Id "Source_Code_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1613
-  1613 property type memory_properties.aadl:42:02
+  Property_Name_Type Node_Id 1615
+  1615 property type memory_properties.aadl:42:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1600
-   1600 unique property type identifier memory_properties.aadl:42:18
-    Identifier Node_Id 1599
-    1599 identifier memory_properties.aadl:42:20
+   Property_Type_Designator Node_Id 1602
+   1602 unique property type identifier memory_properties.aadl:42:18
+    Identifier Node_Id 1601
+    1601 identifier memory_properties.aadl:42:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2706
-   2706 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2707
-    2707 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2708
-     2708 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2709
-      2709 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2708
+   2708 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2709
+    2709 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2710
+     2710 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2711
+      2711 literal memory_properties.aadl:7:25
        Value Value_Id 94
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2710
-     2710 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2711
-      2711 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2712
+     2712 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2713
+      2713 literal aadl_project.aadl:101:37
        Value Value_Id 95
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1612
-  1612 applies to memory_properties.aadl:42:02
+  Applies_To Node_Id 1614
+  1614 applies to memory_properties.aadl:42:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1602
-   1603 named element memory_properties.aadl:43:15
+   Owner_Categories List_Id 1604
+   1605 named element memory_properties.aadl:43:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1604 named element memory_properties.aadl:43:21
+   1606 named element memory_properties.aadl:43:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1605 named element memory_properties.aadl:43:29
+   1607 named element memory_properties.aadl:43:29
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1606 named element memory_properties.aadl:43:43
+   1608 named element memory_properties.aadl:43:43
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1607 named element memory_properties.aadl:43:52
+   1609 named element memory_properties.aadl:43:52
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   1608 named element memory_properties.aadl:43:60
+   1610 named element memory_properties.aadl:43:60
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1609 named element memory_properties.aadl:43:72
+   1611 named element memory_properties.aadl:43:72
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1610 named element memory_properties.aadl:43:83
+   1612 named element memory_properties.aadl:43:83
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 1627 property definition declaration memory_properties.aadl:45:02
-  Identifier Node_Id 1614
-  1614 identifier memory_properties.aadl:45:02
-   Corresponding_Entity Node_Id 1627
+ 1629 property definition declaration memory_properties.aadl:45:02
+  Identifier Node_Id 1616
+  1616 identifier memory_properties.aadl:45:02
+   Corresponding_Entity Node_Id 1629
    Display_Name Name_Id "Code_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1629
-  1629 property type memory_properties.aadl:45:02
+  Property_Name_Type Node_Id 1631
+  1631 property type memory_properties.aadl:45:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1616
-   1616 unique property type identifier memory_properties.aadl:45:11
-    Identifier Node_Id 1615
-    1615 identifier memory_properties.aadl:45:13
+   Property_Type_Designator Node_Id 1618
+   1618 unique property type identifier memory_properties.aadl:45:11
+    Identifier Node_Id 1617
+    1617 identifier memory_properties.aadl:45:13
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2712
-   2712 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2713
-    2713 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2714
-     2714 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2715
-      2715 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2714
+   2714 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2715
+    2715 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2716
+     2716 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2717
+      2717 literal memory_properties.aadl:7:25
        Value Value_Id 96
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2716
-     2716 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2717
-      2717 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2718
+     2718 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2719
+      2719 literal aadl_project.aadl:101:37
        Value Value_Id 97
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1628
-  1628 applies to memory_properties.aadl:45:02
+  Applies_To Node_Id 1630
+  1630 applies to memory_properties.aadl:45:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1618
-   1619 named element memory_properties.aadl:46:15
+   Owner_Categories List_Id 1620
+   1621 named element memory_properties.aadl:46:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1620 named element memory_properties.aadl:46:21
+   1622 named element memory_properties.aadl:46:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1621 named element memory_properties.aadl:46:29
+   1623 named element memory_properties.aadl:46:29
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1622 named element memory_properties.aadl:46:43
+   1624 named element memory_properties.aadl:46:43
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1623 named element memory_properties.aadl:46:52
+   1625 named element memory_properties.aadl:46:52
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   1624 named element memory_properties.aadl:46:60
+   1626 named element memory_properties.aadl:46:60
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1625 named element memory_properties.aadl:46:72
+   1627 named element memory_properties.aadl:46:72
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1626 named element memory_properties.aadl:46:83
+   1628 named element memory_properties.aadl:46:83
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 1643 property definition declaration memory_properties.aadl:48:02
-  Identifier Node_Id 1630
-  1630 identifier memory_properties.aadl:48:02
-   Corresponding_Entity Node_Id 1643
+ 1645 property definition declaration memory_properties.aadl:48:02
+  Identifier Node_Id 1632
+  1632 identifier memory_properties.aadl:48:02
+   Corresponding_Entity Node_Id 1645
    Display_Name Name_Id "Source_Data_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1645
-  1645 property type memory_properties.aadl:48:02
+  Property_Name_Type Node_Id 1647
+  1647 property type memory_properties.aadl:48:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1632
-   1632 unique property type identifier memory_properties.aadl:48:18
-    Identifier Node_Id 1631
-    1631 identifier memory_properties.aadl:48:20
+   Property_Type_Designator Node_Id 1634
+   1634 unique property type identifier memory_properties.aadl:48:18
+    Identifier Node_Id 1633
+    1633 identifier memory_properties.aadl:48:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2718
-   2718 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2719
-    2719 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2720
-     2720 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2721
-      2721 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2720
+   2720 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2721
+    2721 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2722
+     2722 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2723
+      2723 literal memory_properties.aadl:7:25
        Value Value_Id 98
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2722
-     2722 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2723
-      2723 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2724
+     2724 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2725
+      2725 literal aadl_project.aadl:101:37
        Value Value_Id 99
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1644
-  1644 applies to memory_properties.aadl:48:02
+  Applies_To Node_Id 1646
+  1646 applies to memory_properties.aadl:48:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1634
-   1635 named element memory_properties.aadl:49:15
+   Owner_Categories List_Id 1636
+   1637 named element memory_properties.aadl:49:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1636 named element memory_properties.aadl:49:21
+   1638 named element memory_properties.aadl:49:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1637 named element memory_properties.aadl:49:33
+   1639 named element memory_properties.aadl:49:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1638 named element memory_properties.aadl:49:41
+   1640 named element memory_properties.aadl:49:41
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1639 named element memory_properties.aadl:49:55
+   1641 named element memory_properties.aadl:49:55
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1640 named element memory_properties.aadl:49:64
+   1642 named element memory_properties.aadl:49:64
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   1641 named element memory_properties.aadl:49:72
+   1643 named element memory_properties.aadl:49:72
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1642 named element memory_properties.aadl:49:83
+   1644 named element memory_properties.aadl:49:83
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 1659 property definition declaration memory_properties.aadl:51:02
-  Identifier Node_Id 1646
-  1646 identifier memory_properties.aadl:51:02
-   Corresponding_Entity Node_Id 1659
+ 1661 property definition declaration memory_properties.aadl:51:02
+  Identifier Node_Id 1648
+  1648 identifier memory_properties.aadl:51:02
+   Corresponding_Entity Node_Id 1661
    Display_Name Name_Id "Data_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1661
-  1661 property type memory_properties.aadl:51:02
+  Property_Name_Type Node_Id 1663
+  1663 property type memory_properties.aadl:51:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1648
-   1648 unique property type identifier memory_properties.aadl:51:11
-    Identifier Node_Id 1647
-    1647 identifier memory_properties.aadl:51:13
+   Property_Type_Designator Node_Id 1650
+   1650 unique property type identifier memory_properties.aadl:51:11
+    Identifier Node_Id 1649
+    1649 identifier memory_properties.aadl:51:13
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2724
-   2724 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2725
-    2725 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2726
-     2726 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2727
-      2727 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2726
+   2726 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2727
+    2727 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2728
+     2728 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2729
+      2729 literal memory_properties.aadl:7:25
        Value Value_Id 100
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2728
-     2728 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2729
-      2729 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2730
+     2730 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2731
+      2731 literal aadl_project.aadl:101:37
        Value Value_Id 101
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1660
-  1660 applies to memory_properties.aadl:51:02
+  Applies_To Node_Id 1662
+  1662 applies to memory_properties.aadl:51:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1650
-   1651 named element memory_properties.aadl:52:15
+   Owner_Categories List_Id 1652
+   1653 named element memory_properties.aadl:52:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   1652 named element memory_properties.aadl:52:21
+   1654 named element memory_properties.aadl:52:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1653 named element memory_properties.aadl:52:33
+   1655 named element memory_properties.aadl:52:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1654 named element memory_properties.aadl:52:41
+   1656 named element memory_properties.aadl:52:41
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1655 named element memory_properties.aadl:52:55
+   1657 named element memory_properties.aadl:52:55
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1656 named element memory_properties.aadl:52:64
+   1658 named element memory_properties.aadl:52:64
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   1657 named element memory_properties.aadl:52:72
+   1659 named element memory_properties.aadl:52:72
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1658 named element memory_properties.aadl:52:83
+   1660 named element memory_properties.aadl:52:83
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 1669 property definition declaration memory_properties.aadl:54:02
-  Identifier Node_Id 1662
-  1662 identifier memory_properties.aadl:54:02
-   Corresponding_Entity Node_Id 1669
+ 1671 property definition declaration memory_properties.aadl:54:02
+  Identifier Node_Id 1664
+  1664 identifier memory_properties.aadl:54:02
+   Corresponding_Entity Node_Id 1671
    Display_Name Name_Id "Source_Heap_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1671
-  1671 property type memory_properties.aadl:54:02
+  Property_Name_Type Node_Id 1673
+  1673 property type memory_properties.aadl:54:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1664
-   1664 unique property type identifier memory_properties.aadl:54:18
-    Identifier Node_Id 1663
-    1663 identifier memory_properties.aadl:54:20
+   Property_Type_Designator Node_Id 1666
+   1666 unique property type identifier memory_properties.aadl:54:18
+    Identifier Node_Id 1665
+    1665 identifier memory_properties.aadl:54:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2730
-   2730 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2731
-    2731 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2732
-     2732 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2733
-      2733 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2732
+   2732 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2733
+    2733 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2734
+     2734 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2735
+      2735 literal memory_properties.aadl:7:25
        Value Value_Id 102
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2734
-     2734 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2735
-      2735 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2736
+     2736 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2737
+      2737 literal aadl_project.aadl:101:37
        Value Value_Id 103
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1670
-  1670 applies to memory_properties.aadl:54:02
+  Applies_To Node_Id 1672
+  1672 applies to memory_properties.aadl:54:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1666
-   1667 named element memory_properties.aadl:55:15
+   Owner_Categories List_Id 1668
+   1669 named element memory_properties.aadl:55:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1668 named element memory_properties.aadl:55:23
+   1670 named element memory_properties.aadl:55:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1679 property definition declaration memory_properties.aadl:57:02
-  Identifier Node_Id 1672
-  1672 identifier memory_properties.aadl:57:02
-   Corresponding_Entity Node_Id 1679
+ 1681 property definition declaration memory_properties.aadl:57:02
+  Identifier Node_Id 1674
+  1674 identifier memory_properties.aadl:57:02
+   Corresponding_Entity Node_Id 1681
    Display_Name Name_Id "Heap_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1681
-  1681 property type memory_properties.aadl:57:02
+  Property_Name_Type Node_Id 1683
+  1683 property type memory_properties.aadl:57:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1674
-   1674 unique property type identifier memory_properties.aadl:57:11
-    Identifier Node_Id 1673
-    1673 identifier memory_properties.aadl:57:13
+   Property_Type_Designator Node_Id 1676
+   1676 unique property type identifier memory_properties.aadl:57:11
+    Identifier Node_Id 1675
+    1675 identifier memory_properties.aadl:57:13
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2736
-   2736 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2737
-    2737 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2738
-     2738 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2739
-      2739 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2738
+   2738 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2739
+    2739 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2740
+     2740 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2741
+      2741 literal memory_properties.aadl:7:25
        Value Value_Id 104
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2740
-     2740 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2741
-      2741 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2742
+     2742 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2743
+      2743 literal aadl_project.aadl:101:37
        Value Value_Id 105
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1680
-  1680 applies to memory_properties.aadl:57:02
+  Applies_To Node_Id 1682
+  1682 applies to memory_properties.aadl:57:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1676
-   1677 named element memory_properties.aadl:58:15
+   Owner_Categories List_Id 1678
+   1679 named element memory_properties.aadl:58:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1678 named element memory_properties.aadl:58:23
+   1680 named element memory_properties.aadl:58:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1691 property definition declaration memory_properties.aadl:60:02
-  Identifier Node_Id 1682
-  1682 identifier memory_properties.aadl:60:02
-   Corresponding_Entity Node_Id 1691
+ 1693 property definition declaration memory_properties.aadl:60:02
+  Identifier Node_Id 1684
+  1684 identifier memory_properties.aadl:60:02
+   Corresponding_Entity Node_Id 1693
    Display_Name Name_Id "Source_Stack_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1693
-  1693 property type memory_properties.aadl:60:02
+  Property_Name_Type Node_Id 1695
+  1695 property type memory_properties.aadl:60:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1684
-   1684 unique property type identifier memory_properties.aadl:60:19
-    Identifier Node_Id 1683
-    1683 identifier memory_properties.aadl:60:21
+   Property_Type_Designator Node_Id 1686
+   1686 unique property type identifier memory_properties.aadl:60:19
+    Identifier Node_Id 1685
+    1685 identifier memory_properties.aadl:60:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2742
-   2742 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2743
-    2743 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2744
-     2744 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2745
-      2745 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2744
+   2744 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2745
+    2745 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2746
+     2746 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2747
+      2747 literal memory_properties.aadl:7:25
        Value Value_Id 106
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2746
-     2746 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2747
-      2747 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2748
+     2748 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2749
+      2749 literal aadl_project.aadl:101:37
        Value Value_Id 107
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1692
-  1692 applies to memory_properties.aadl:60:02
+  Applies_To Node_Id 1694
+  1694 applies to memory_properties.aadl:60:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1686
-   1687 named element memory_properties.aadl:61:15
+   Owner_Categories List_Id 1688
+   1689 named element memory_properties.aadl:61:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1688 named element memory_properties.aadl:61:23
+   1690 named element memory_properties.aadl:61:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1689 named element memory_properties.aadl:61:35
+   1691 named element memory_properties.aadl:61:35
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1690 named element memory_properties.aadl:61:46
+   1692 named element memory_properties.aadl:61:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 1703 property definition declaration memory_properties.aadl:63:02
-  Identifier Node_Id 1694
-  1694 identifier memory_properties.aadl:63:02
-   Corresponding_Entity Node_Id 1703
+ 1705 property definition declaration memory_properties.aadl:63:02
+  Identifier Node_Id 1696
+  1696 identifier memory_properties.aadl:63:02
+   Corresponding_Entity Node_Id 1705
    Display_Name Name_Id "Stack_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1705
-  1705 property type memory_properties.aadl:63:02
+  Property_Name_Type Node_Id 1707
+  1707 property type memory_properties.aadl:63:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1696
-   1696 unique property type identifier memory_properties.aadl:63:12
-    Identifier Node_Id 1695
-    1695 identifier memory_properties.aadl:63:14
+   Property_Type_Designator Node_Id 1698
+   1698 unique property type identifier memory_properties.aadl:63:12
+    Identifier Node_Id 1697
+    1697 identifier memory_properties.aadl:63:14
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2748
-   2748 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2749
-    2749 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2750
-     2750 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2751
-      2751 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2750
+   2750 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2751
+    2751 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2752
+     2752 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2753
+      2753 literal memory_properties.aadl:7:25
        Value Value_Id 108
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2752
-     2752 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2753
-      2753 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2754
+     2754 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2755
+      2755 literal aadl_project.aadl:101:37
        Value Value_Id 109
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1704
-  1704 applies to memory_properties.aadl:63:02
+  Applies_To Node_Id 1706
+  1706 applies to memory_properties.aadl:63:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1698
-   1699 named element memory_properties.aadl:64:15
+   Owner_Categories List_Id 1700
+   1701 named element memory_properties.aadl:64:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1700 named element memory_properties.aadl:64:23
+   1702 named element memory_properties.aadl:64:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1701 named element memory_properties.aadl:64:35
+   1703 named element memory_properties.aadl:64:35
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1702 named element memory_properties.aadl:64:46
+   1704 named element memory_properties.aadl:64:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 1716 property definition declaration memory_properties.aadl:66:02
-  Identifier Node_Id 1706
-  1706 identifier memory_properties.aadl:66:02
-   Corresponding_Entity Node_Id 1716
+ 1718 property definition declaration memory_properties.aadl:66:02
+  Identifier Node_Id 1708
+  1708 identifier memory_properties.aadl:66:02
+   Corresponding_Entity Node_Id 1718
    Display_Name Name_Id "Byte_Count"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1718
-  1718 property type memory_properties.aadl:66:02
+  Property_Name_Type Node_Id 1720
+  1720 property type memory_properties.aadl:66:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1707
-   1707 integer type memory_properties.aadl:66:14
-    Type_Range Node_Id 1712
-    1712 number range memory_properties.aadl:66:26
-     Lower_Bound Node_Id 1708
-     1708 signed aadlnumber memory_properties.aadl:66:26
-      Number_Value Node_Id 1709
-      1709 literal memory_properties.aadl:66:26
+   Property_Type_Designator Node_Id 1709
+   1709 integer type memory_properties.aadl:66:14
+    Type_Range Node_Id 1714
+    1714 number range memory_properties.aadl:66:26
+     Lower_Bound Node_Id 1710
+     1710 signed aadlnumber memory_properties.aadl:66:26
+      Number_Value Node_Id 1711
+      1711 literal memory_properties.aadl:66:26
        Value Value_Id 56
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 1711
-     1711 property term memory_properties.aadl:66:28
-      Identifier Node_Id 1710
-      1710 identifier memory_properties.aadl:66:31
+     Upper_Bound Node_Id 1713
+     1713 property term memory_properties.aadl:66:28
+      Identifier Node_Id 1712
+      1712 identifier memory_properties.aadl:66:31
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Max_Byte_Count"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 212
+      Entity Node_Id 214
       Property_Set_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2754
-   2754 integer type memory_properties.aadl:66:14
-    Type_Range Node_Id 2755
-    2755 number range memory_properties.aadl:66:26
-     Lower_Bound Node_Id 2756
-     2756 signed aadlnumber memory_properties.aadl:66:26
-      Number_Value Node_Id 2757
-      2757 literal memory_properties.aadl:66:26
+   Expanded_Type_Designator Node_Id 2756
+   2756 integer type memory_properties.aadl:66:14
+    Type_Range Node_Id 2757
+    2757 number range memory_properties.aadl:66:26
+     Lower_Bound Node_Id 2758
+     2758 signed aadlnumber memory_properties.aadl:66:26
+      Number_Value Node_Id 2759
+      2759 literal memory_properties.aadl:66:26
        Value Value_Id 110
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 2758
-     2758 signed aadlnumber aadl_project.aadl:109:43
-      Number_Value Node_Id 2759
-      2759 literal aadl_project.aadl:109:43
+     Upper_Bound Node_Id 2760
+     2760 signed aadlnumber aadl_project.aadl:111:43
+      Number_Value Node_Id 2761
+      2761 literal aadl_project.aadl:111:43
        Value Value_Id 111
       Unit_Identifier Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1717
-  1717 applies to memory_properties.aadl:66:02
+  Applies_To Node_Id 1719
+  1719 applies to memory_properties.aadl:66:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1714
-   1715 named element memory_properties.aadl:67:15
+   Owner_Categories List_Id 1716
+   1717 named element memory_properties.aadl:67:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 1725 property definition declaration memory_properties.aadl:69:09
-  Identifier Node_Id 1719
-  1719 identifier memory_properties.aadl:69:09
-   Corresponding_Entity Node_Id 1725
+ 1727 property definition declaration memory_properties.aadl:69:09
+  Identifier Node_Id 1721
+  1721 identifier memory_properties.aadl:69:09
+   Corresponding_Entity Node_Id 1727
    Display_Name Name_Id "Memory_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1727
-  1727 property type memory_properties.aadl:69:09
+  Property_Name_Type Node_Id 1729
+  1729 property type memory_properties.aadl:69:09
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1721
-   1721 unique property type identifier memory_properties.aadl:69:20
-    Identifier Node_Id 1720
-    1720 identifier memory_properties.aadl:69:22
+   Property_Type_Designator Node_Id 1723
+   1723 unique property type identifier memory_properties.aadl:69:20
+    Identifier Node_Id 1722
+    1722 identifier memory_properties.aadl:69:22
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2760
-   2760 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2761
-    2761 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2762
-     2762 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2763
-      2763 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2762
+   2762 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2763
+    2763 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2764
+     2764 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2765
+      2765 literal memory_properties.aadl:7:25
        Value Value_Id 112
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2764
-     2764 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2765
-      2765 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2766
+     2766 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2767
+      2767 literal aadl_project.aadl:101:37
        Value Value_Id 113
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1726
-  1726 applies to memory_properties.aadl:69:09
+  Applies_To Node_Id 1728
+  1728 applies to memory_properties.aadl:69:09
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1723
-   1724 named element memory_properties.aadl:69:39
+   Owner_Categories List_Id 1725
+   1726 named element memory_properties.aadl:69:39
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 1737 property definition declaration memory_properties.aadl:71:02
-  Identifier Node_Id 1728
-  1728 identifier memory_properties.aadl:71:02
-   Corresponding_Entity Node_Id 1737
+ 1739 property definition declaration memory_properties.aadl:71:02
+  Identifier Node_Id 1730
+  1730 identifier memory_properties.aadl:71:02
+   Corresponding_Entity Node_Id 1739
    Display_Name Name_Id "Word_Size"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1739
-  1739 property type memory_properties.aadl:71:02
+  Property_Name_Type Node_Id 1741
+  1741 property type memory_properties.aadl:71:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1730
-   1730 unique property type identifier memory_properties.aadl:71:11
-    Identifier Node_Id 1729
-    1729 identifier memory_properties.aadl:71:13
+   Property_Type_Designator Node_Id 1732
+   1732 unique property type identifier memory_properties.aadl:71:11
+    Identifier Node_Id 1731
+    1731 identifier memory_properties.aadl:71:13
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1446
+    Entity Node_Id 1448
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2766
-   2766 integer type memory_properties.aadl:7:13
-    Type_Range Node_Id 2767
-    2767 number range memory_properties.aadl:7:25
-     Lower_Bound Node_Id 2768
-     2768 signed aadlnumber memory_properties.aadl:7:25
-      Number_Value Node_Id 2769
-      2769 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2768
+   2768 integer type memory_properties.aadl:7:13
+    Type_Range Node_Id 2769
+    2769 number range memory_properties.aadl:7:25
+     Lower_Bound Node_Id 2770
+     2770 signed aadlnumber memory_properties.aadl:7:25
+      Number_Value Node_Id 2771
+      2771 literal memory_properties.aadl:7:25
        Value Value_Id 114
-      Unit_Identifier Node_Id 1440
-      1440 identifier memory_properties.aadl:7:27
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 1442
+      1442 identifier memory_properties.aadl:7:27
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2770
-     2770 signed aadlnumber aadl_project.aadl:99:37
-      Number_Value Node_Id 2771
-      2771 literal aadl_project.aadl:99:37
+     Upper_Bound Node_Id 2772
+     2772 signed aadlnumber aadl_project.aadl:101:37
+      Number_Value Node_Id 2773
+      2773 literal aadl_project.aadl:101:37
        Value Value_Id 115
-      Unit_Identifier Node_Id 179
-      179 identifier aadl_project.aadl:99:45
-       Corresponding_Entity Node_Id 225
+      Unit_Identifier Node_Id 181
+      181 identifier aadl_project.aadl:101:45
+       Corresponding_Entity Node_Id 227
        Display_Name Name_Id "Bytes"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1445
-    1445 unique property type identifier memory_properties.aadl:7:52
-     Identifier Node_Id 1444
-     1444 identifier memory_properties.aadl:7:58
+    Unit_Designator Node_Id 1447
+    1447 unique property type identifier memory_properties.aadl:7:52
+     Identifier Node_Id 1446
+     1446 identifier memory_properties.aadl:7:58
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Size_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 244
+     Entity Node_Id 246
      Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1740
-  1740 property value memory_properties.aadl:71:02
-   Value_Container Node_Id 1434
-   Single_Value Node_Id 1731
-   1731 signed aadlnumber memory_properties.aadl:71:21
-    Number_Value Node_Id 1732
-    1732 literal memory_properties.aadl:71:21
+  Default_Value Node_Id 1742
+  1742 property value memory_properties.aadl:71:02
+   Value_Container Node_Id 1436
+   Single_Value Node_Id 1733
+   1733 signed aadlnumber memory_properties.aadl:71:21
+    Number_Value Node_Id 1734
+    1734 literal memory_properties.aadl:71:21
      Value Value_Id 57
-    Unit_Identifier Node_Id 1733
-    1733 identifier memory_properties.aadl:71:23
-     Corresponding_Entity Node_Id 222
+    Unit_Identifier Node_Id 1735
+    1735 identifier memory_properties.aadl:71:23
+     Corresponding_Entity Node_Id 224
      Display_Name Name_Id "bits"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2772
-   2772 signed aadlnumber memory_properties.aadl:71:21
-    Number_Value Node_Id 2773
-    2773 literal memory_properties.aadl:71:21
+   Expanded_Single_Value Node_Id 2774
+   2774 signed aadlnumber memory_properties.aadl:71:21
+    Number_Value Node_Id 2775
+    2775 literal memory_properties.aadl:71:21
      Value Value_Id 116
-    Unit_Identifier Node_Id 1733
-    1733 identifier memory_properties.aadl:71:23
-     Corresponding_Entity Node_Id 222
+    Unit_Identifier Node_Id 1735
+    1735 identifier memory_properties.aadl:71:23
+     Corresponding_Entity Node_Id 224
      Display_Name Name_Id "bits"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1738
-  1738 applies to memory_properties.aadl:71:02
+  Applies_To Node_Id 1740
+  1740 applies to memory_properties.aadl:71:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1735
-   1736 named element memory_properties.aadl:72:15
+   Owner_Categories List_Id 1737
+   1738 named element memory_properties.aadl:72:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 1753 property definition declaration memory_properties.aadl:74:02
-  Identifier Node_Id 1741
-  1741 identifier memory_properties.aadl:74:02
-   Corresponding_Entity Node_Id 1753
+ 1755 property definition declaration memory_properties.aadl:74:02
+  Identifier Node_Id 1743
+  1743 identifier memory_properties.aadl:74:02
+   Corresponding_Entity Node_Id 1755
    Display_Name Name_Id "Word_Space"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1755
-  1755 property type memory_properties.aadl:74:02
+  Property_Name_Type Node_Id 1757
+  1757 property type memory_properties.aadl:74:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1742
-   1742 integer type memory_properties.aadl:74:14
-    Type_Range Node_Id 1747
-    1747 number range memory_properties.aadl:74:26
-     Lower_Bound Node_Id 1743
-     1743 signed aadlnumber memory_properties.aadl:74:26
-      Number_Value Node_Id 1744
-      1744 literal memory_properties.aadl:74:26
+   Property_Type_Designator Node_Id 1744
+   1744 integer type memory_properties.aadl:74:14
+    Type_Range Node_Id 1749
+    1749 number range memory_properties.aadl:74:26
+     Lower_Bound Node_Id 1745
+     1745 signed aadlnumber memory_properties.aadl:74:26
+      Number_Value Node_Id 1746
+      1746 literal memory_properties.aadl:74:26
        Value Value_Id 58
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 1746
-     1746 property term memory_properties.aadl:74:28
-      Identifier Node_Id 1745
-      1745 identifier memory_properties.aadl:74:31
+     Upper_Bound Node_Id 1748
+     1748 property term memory_properties.aadl:74:28
+      Identifier Node_Id 1747
+      1747 identifier memory_properties.aadl:74:31
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Max_Word_Space"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 218
+      Entity Node_Id 220
       Property_Set_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2774
-   2774 integer type memory_properties.aadl:74:14
-    Type_Range Node_Id 2775
-    2775 number range memory_properties.aadl:74:26
-     Lower_Bound Node_Id 2776
-     2776 signed aadlnumber memory_properties.aadl:74:26
-      Number_Value Node_Id 2777
-      2777 literal memory_properties.aadl:74:26
+   Expanded_Type_Designator Node_Id 2776
+   2776 integer type memory_properties.aadl:74:14
+    Type_Range Node_Id 2777
+    2777 number range memory_properties.aadl:74:26
+     Lower_Bound Node_Id 2778
+     2778 signed aadlnumber memory_properties.aadl:74:26
+      Number_Value Node_Id 2779
+      2779 literal memory_properties.aadl:74:26
        Value Value_Id 117
       Unit_Identifier Node_Id 0
-     Upper_Bound Node_Id 2778
-     2778 signed aadlnumber aadl_project.aadl:111:43
-      Number_Value Node_Id 2779
-      2779 literal aadl_project.aadl:111:43
+     Upper_Bound Node_Id 2780
+     2780 signed aadlnumber aadl_project.aadl:113:43
+      Number_Value Node_Id 2781
+      2781 literal aadl_project.aadl:113:43
        Value Value_Id 118
       Unit_Identifier Node_Id 0
     Unit_Designator Node_Id 0
-  Default_Value Node_Id 1756
-  1756 property value memory_properties.aadl:74:02
-   Value_Container Node_Id 1434
-   Single_Value Node_Id 1748
-   1748 signed aadlnumber memory_properties.aadl:74:49
-    Number_Value Node_Id 1749
-    1749 literal memory_properties.aadl:74:49
+  Default_Value Node_Id 1758
+  1758 property value memory_properties.aadl:74:02
+   Value_Container Node_Id 1436
+   Single_Value Node_Id 1750
+   1750 signed aadlnumber memory_properties.aadl:74:49
+    Number_Value Node_Id 1751
+    1751 literal memory_properties.aadl:74:49
      Value Value_Id 59
     Unit_Identifier Node_Id 0
    Multi_Value List_Id 0
-   Expanded_Single_Value Node_Id 2780
-   2780 signed aadlnumber memory_properties.aadl:74:49
-    Number_Value Node_Id 2781
-    2781 literal memory_properties.aadl:74:49
+   Expanded_Single_Value Node_Id 2782
+   2782 signed aadlnumber memory_properties.aadl:74:49
+    Number_Value Node_Id 2783
+    2783 literal memory_properties.aadl:74:49
      Value Value_Id 119
     Unit_Identifier Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1754
-  1754 applies to memory_properties.aadl:74:02
+  Applies_To Node_Id 1756
+  1756 applies to memory_properties.aadl:74:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1751
-   1752 named element memory_properties.aadl:75:15
+   Owner_Categories List_Id 1753
+   1754 named element memory_properties.aadl:75:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
- 1771 property definition declaration memory_properties.aadl:77:02
-  Identifier Node_Id 1757
-  1757 identifier memory_properties.aadl:77:02
-   Corresponding_Entity Node_Id 1771
+ 1773 property definition declaration memory_properties.aadl:77:02
+  Identifier Node_Id 1759
+  1759 identifier memory_properties.aadl:77:02
+   Corresponding_Entity Node_Id 1773
    Display_Name Name_Id "Write_Time"
-   Scope_Entity Node_Id 1435
+   Scope_Entity Node_Id 1437
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1773
-  1773 property type memory_properties.aadl:77:02
+  Property_Name_Type Node_Id 1775
+  1775 property type memory_properties.aadl:77:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1767
-   1767 record type memory_properties.aadl:77:21
-    List_Items List_Id 1758
-    1759 record type element memory_properties.aadl:78:03
-     Identifier Node_Id 1760
-     1760 identifier memory_properties.aadl:78:03
-      Corresponding_Entity Node_Id 1759
+   Property_Type_Designator Node_Id 1769
+   1769 record type memory_properties.aadl:77:21
+    List_Items List_Id 1760
+    1761 record type element memory_properties.aadl:78:03
+     Identifier Node_Id 1762
+     1762 identifier memory_properties.aadl:78:03
+      Corresponding_Entity Node_Id 1761
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1762
-     1762 unique property type identifier memory_properties.aadl:78:08
-      Identifier Node_Id 1761
-      1761 identifier memory_properties.aadl:78:10
+     Property_Type_Designator Node_Id 1764
+     1764 unique property type identifier memory_properties.aadl:78:08
+      Identifier Node_Id 1763
+      1763 identifier memory_properties.aadl:78:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1763 record type element memory_properties.aadl:79:03
-     Identifier Node_Id 1764
-     1764 identifier memory_properties.aadl:79:03
-      Corresponding_Entity Node_Id 1763
+    1765 record type element memory_properties.aadl:79:03
+     Identifier Node_Id 1766
+     1766 identifier memory_properties.aadl:79:03
+      Corresponding_Entity Node_Id 1765
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1766
-     1766 unique property type identifier memory_properties.aadl:79:10
-      Identifier Node_Id 1765
-      1765 identifier memory_properties.aadl:79:12
+     Property_Type_Designator Node_Id 1768
+     1768 unique property type identifier memory_properties.aadl:79:10
+      Identifier Node_Id 1767
+      1767 identifier memory_properties.aadl:79:12
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 1767
-   1767 record type memory_properties.aadl:77:21
-    List_Items List_Id 1758
-    1759 record type element memory_properties.aadl:78:03
-     Identifier Node_Id 1760
-     1760 identifier memory_properties.aadl:78:03
-      Corresponding_Entity Node_Id 1759
+   Expanded_Type_Designator Node_Id 1769
+   1769 record type memory_properties.aadl:77:21
+    List_Items List_Id 1760
+    1761 record type element memory_properties.aadl:78:03
+     Identifier Node_Id 1762
+     1762 identifier memory_properties.aadl:78:03
+      Corresponding_Entity Node_Id 1761
       Display_Name Name_Id "Fixed"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1762
-     1762 unique property type identifier memory_properties.aadl:78:08
-      Identifier Node_Id 1761
-      1761 identifier memory_properties.aadl:78:10
+     Property_Type_Designator Node_Id 1764
+     1764 unique property type identifier memory_properties.aadl:78:08
+      Identifier Node_Id 1763
+      1763 identifier memory_properties.aadl:78:10
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
-    1763 record type element memory_properties.aadl:79:03
-     Identifier Node_Id 1764
-     1764 identifier memory_properties.aadl:79:03
-      Corresponding_Entity Node_Id 1763
+    1765 record type element memory_properties.aadl:79:03
+     Identifier Node_Id 1766
+     1766 identifier memory_properties.aadl:79:03
+      Corresponding_Entity Node_Id 1765
       Display_Name Name_Id "PerByte"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
-     Property_Type_Designator Node_Id 1766
-     1766 unique property type identifier memory_properties.aadl:79:10
-      Identifier Node_Id 1765
-      1765 identifier memory_properties.aadl:79:12
+     Property_Type_Designator Node_Id 1768
+     1768 unique property type identifier memory_properties.aadl:79:10
+      Identifier Node_Id 1767
+      1767 identifier memory_properties.aadl:79:12
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 1869
+      Entity Node_Id 1871
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1772
-  1772 applies to memory_properties.aadl:77:02
+  Applies_To Node_Id 1774
+  1774 applies to memory_properties.aadl:77:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1769
-   1770 named element memory_properties.aadl:80:15
+   Owner_Categories List_Id 1771
+   1772 named element memory_properties.aadl:80:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-1775 property set modeling_properties.aadl:6:01
- Identifier Node_Id 1774
- 1774 identifier modeling_properties.aadl:6:14
-  Corresponding_Entity Node_Id 1775
+1777 property set modeling_properties.aadl:6:01
+ Identifier Node_Id 1776
+ 1776 identifier modeling_properties.aadl:6:14
+  Corresponding_Entity Node_Id 1777
   Display_Name Name_Id "Modeling_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 1776
- Declarations List_Id 1788
- 1785 property definition declaration modeling_properties.aadl:7:02
-  Identifier Node_Id 1777
-  1777 identifier modeling_properties.aadl:7:02
-   Corresponding_Entity Node_Id 1785
+ Entity_Scope Node_Id 1778
+ Declarations List_Id 1790
+ 1787 property definition declaration modeling_properties.aadl:7:02
+  Identifier Node_Id 1779
+  1779 identifier modeling_properties.aadl:7:02
+   Corresponding_Entity Node_Id 1787
    Display_Name Name_Id "Acceptable_Array_Size"
-   Scope_Entity Node_Id 1776
+   Scope_Entity Node_Id 1778
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1787
-  1787 property type modeling_properties.aadl:7:02
+  Property_Name_Type Node_Id 1789
+  1789 property type modeling_properties.aadl:7:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 1780
-   1780 unique property type identifier modeling_properties.aadl:7:30
-    Identifier Node_Id 1779
-    1779 identifier modeling_properties.aadl:7:33
+   Property_Type_Designator Node_Id 1782
+   1782 unique property type identifier modeling_properties.aadl:7:30
+    Identifier Node_Id 1781
+    1781 identifier modeling_properties.aadl:7:33
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Size_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1452
+    Entity Node_Id 1454
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2782
-   2782 range type memory_properties.aadl:9:19
-    Number_Type Node_Id 2783
-    2783 integer type memory_properties.aadl:7:13
-     Type_Range Node_Id 2784
-     2784 number range memory_properties.aadl:7:25
-      Lower_Bound Node_Id 2785
-      2785 signed aadlnumber memory_properties.aadl:7:25
-       Number_Value Node_Id 2786
-       2786 literal memory_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2784
+   2784 range type memory_properties.aadl:9:19
+    Number_Type Node_Id 2785
+    2785 integer type memory_properties.aadl:7:13
+     Type_Range Node_Id 2786
+     2786 number range memory_properties.aadl:7:25
+      Lower_Bound Node_Id 2787
+      2787 signed aadlnumber memory_properties.aadl:7:25
+       Number_Value Node_Id 2788
+       2788 literal memory_properties.aadl:7:25
         Value Value_Id 120
-       Unit_Identifier Node_Id 1440
-       1440 identifier memory_properties.aadl:7:27
-        Corresponding_Entity Node_Id 225
+       Unit_Identifier Node_Id 1442
+       1442 identifier memory_properties.aadl:7:27
+        Corresponding_Entity Node_Id 227
         Display_Name Name_Id "Bytes"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2787
-      2787 signed aadlnumber aadl_project.aadl:99:37
-       Number_Value Node_Id 2788
-       2788 literal aadl_project.aadl:99:37
+      Upper_Bound Node_Id 2789
+      2789 signed aadlnumber aadl_project.aadl:101:37
+       Number_Value Node_Id 2790
+       2790 literal aadl_project.aadl:101:37
         Value Value_Id 121
-       Unit_Identifier Node_Id 179
-       179 identifier aadl_project.aadl:99:45
-        Corresponding_Entity Node_Id 225
+       Unit_Identifier Node_Id 181
+       181 identifier aadl_project.aadl:101:45
+        Corresponding_Entity Node_Id 227
         Display_Name Name_Id "Bytes"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1445
-     1445 unique property type identifier memory_properties.aadl:7:52
-      Identifier Node_Id 1444
-      1444 identifier memory_properties.aadl:7:58
+     Unit_Designator Node_Id 1447
+     1447 unique property type identifier memory_properties.aadl:7:52
+      Identifier Node_Id 1446
+      1446 identifier memory_properties.aadl:7:58
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Size_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 244
+      Entity Node_Id 246
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1786
-  1786 applies to modeling_properties.aadl:7:02
+  Applies_To Node_Id 1788
+  1788 applies to modeling_properties.aadl:7:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1781
-   1782 named element modeling_properties.aadl:8:15
-    Identifier Node_Id 1783
-    1783 identifier modeling_properties.aadl:8:15
+   Owner_Categories List_Id 1783
+   1784 named element modeling_properties.aadl:8:15
+    Identifier Node_Id 1785
+    1785 identifier modeling_properties.aadl:8:15
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "subcomponent"
      Scope_Entity Node_Id 0
@@ -9505,90 +9515,90 @@ Declarations List_Id 7
     Category Byte 23
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1784 named element modeling_properties.aadl:8:29
+   1786 named element modeling_properties.aadl:8:29
     Identifier Node_Id 0
     Category Byte 31
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1803 property definition declaration modeling_properties.aadl:10:02
-  Identifier Node_Id 1789
-  1789 identifier modeling_properties.aadl:10:02
-   Corresponding_Entity Node_Id 1803
+ 1805 property definition declaration modeling_properties.aadl:10:02
+  Identifier Node_Id 1791
+  1791 identifier modeling_properties.aadl:10:02
+   Corresponding_Entity Node_Id 1805
    Display_Name Name_Id "Classifier_Matching_Rule"
-   Scope_Entity Node_Id 1776
+   Scope_Entity Node_Id 1778
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1805
-  1805 property type modeling_properties.aadl:10:02
+  Property_Name_Type Node_Id 1807
+  1807 property type modeling_properties.aadl:10:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1790
-   1790 enumeration type modeling_properties.aadl:10:36
-    Identifiers List_Id 1791
-    1792 identifier modeling_properties.aadl:10:49
-     Corresponding_Entity Node_Id 1790
+   Property_Type_Designator Node_Id 1792
+   1792 enumeration type modeling_properties.aadl:10:36
+    Identifiers List_Id 1793
+    1794 identifier modeling_properties.aadl:10:49
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Classifier_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1793 identifier modeling_properties.aadl:10:67
-     Corresponding_Entity Node_Id 1790
+    1795 identifier modeling_properties.aadl:10:67
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Equivalence"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1794 identifier modeling_properties.aadl:10:80
-     Corresponding_Entity Node_Id 1790
+    1796 identifier modeling_properties.aadl:10:80
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Subset"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1795 identifier modeling_properties.aadl:10:88
-     Corresponding_Entity Node_Id 1790
+    1797 identifier modeling_properties.aadl:10:88
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Conversion"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1796 identifier modeling_properties.aadl:10:100
-     Corresponding_Entity Node_Id 1790
+    1798 identifier modeling_properties.aadl:10:100
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Complement"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1790
-   1790 enumeration type modeling_properties.aadl:10:36
-    Identifiers List_Id 1791
-    1792 identifier modeling_properties.aadl:10:49
-     Corresponding_Entity Node_Id 1790
+   Expanded_Type_Designator Node_Id 1792
+   1792 enumeration type modeling_properties.aadl:10:36
+    Identifiers List_Id 1793
+    1794 identifier modeling_properties.aadl:10:49
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Classifier_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1793 identifier modeling_properties.aadl:10:67
-     Corresponding_Entity Node_Id 1790
+    1795 identifier modeling_properties.aadl:10:67
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Equivalence"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1794 identifier modeling_properties.aadl:10:80
-     Corresponding_Entity Node_Id 1790
+    1796 identifier modeling_properties.aadl:10:80
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Subset"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1795 identifier modeling_properties.aadl:10:88
-     Corresponding_Entity Node_Id 1790
+    1797 identifier modeling_properties.aadl:10:88
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Conversion"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1796 identifier modeling_properties.aadl:10:100
-     Corresponding_Entity Node_Id 1790
+    1798 identifier modeling_properties.aadl:10:100
+     Corresponding_Entity Node_Id 1792
      Display_Name Name_Id "Complement"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1804
-  1804 applies to modeling_properties.aadl:10:02
+  Applies_To Node_Id 1806
+  1806 applies to modeling_properties.aadl:10:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1798
-   1799 named element modeling_properties.aadl:11:15
-    Identifier Node_Id 1800
-    1800 identifier modeling_properties.aadl:11:15
+   Owner_Categories List_Id 1800
+   1801 named element modeling_properties.aadl:11:15
+    Identifier Node_Id 1802
+    1802 identifier modeling_properties.aadl:11:15
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "connection"
      Scope_Entity Node_Id 0
@@ -9596,9 +9606,9 @@ Declarations List_Id 7
     Category Byte 37
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1801 named element modeling_properties.aadl:11:27
-    Identifier Node_Id 1802
-    1802 identifier modeling_properties.aadl:11:27
+   1803 named element modeling_properties.aadl:11:27
+    Identifier Node_Id 1804
+    1804 identifier modeling_properties.aadl:11:27
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "component"
      Scope_Entity Node_Id 0
@@ -9606,70 +9616,70 @@ Declarations List_Id 7
     Category Byte 24
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1817 property definition declaration modeling_properties.aadl:13:02
-  Identifier Node_Id 1806
-  1806 identifier modeling_properties.aadl:13:02
-   Corresponding_Entity Node_Id 1817
+ 1819 property definition declaration modeling_properties.aadl:13:02
+  Identifier Node_Id 1808
+  1808 identifier modeling_properties.aadl:13:02
+   Corresponding_Entity Node_Id 1819
    Display_Name Name_Id "Classifier_Substitution_Rule"
-   Scope_Entity Node_Id 1776
+   Scope_Entity Node_Id 1778
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1819
-  1819 property type modeling_properties.aadl:13:02
+  Property_Name_Type Node_Id 1821
+  1821 property type modeling_properties.aadl:13:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1807
-   1807 enumeration type modeling_properties.aadl:13:40
-    Identifiers List_Id 1808
-    1809 identifier modeling_properties.aadl:13:53
-     Corresponding_Entity Node_Id 1807
+   Property_Type_Designator Node_Id 1809
+   1809 enumeration type modeling_properties.aadl:13:40
+    Identifiers List_Id 1810
+    1811 identifier modeling_properties.aadl:13:53
+     Corresponding_Entity Node_Id 1809
      Display_Name Name_Id "Classifier_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1810 identifier modeling_properties.aadl:13:71
-     Corresponding_Entity Node_Id 1807
+    1812 identifier modeling_properties.aadl:13:71
+     Corresponding_Entity Node_Id 1809
      Display_Name Name_Id "Type_Extension"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1811 identifier modeling_properties.aadl:13:87
-     Corresponding_Entity Node_Id 1807
+    1813 identifier modeling_properties.aadl:13:87
+     Corresponding_Entity Node_Id 1809
      Display_Name Name_Id "Signature_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1807
-   1807 enumeration type modeling_properties.aadl:13:40
-    Identifiers List_Id 1808
-    1809 identifier modeling_properties.aadl:13:53
-     Corresponding_Entity Node_Id 1807
+   Expanded_Type_Designator Node_Id 1809
+   1809 enumeration type modeling_properties.aadl:13:40
+    Identifiers List_Id 1810
+    1811 identifier modeling_properties.aadl:13:53
+     Corresponding_Entity Node_Id 1809
      Display_Name Name_Id "Classifier_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1810 identifier modeling_properties.aadl:13:71
-     Corresponding_Entity Node_Id 1807
+    1812 identifier modeling_properties.aadl:13:71
+     Corresponding_Entity Node_Id 1809
      Display_Name Name_Id "Type_Extension"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1811 identifier modeling_properties.aadl:13:87
-     Corresponding_Entity Node_Id 1807
+    1813 identifier modeling_properties.aadl:13:87
+     Corresponding_Entity Node_Id 1809
      Display_Name Name_Id "Signature_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1818
-  1818 applies to modeling_properties.aadl:13:02
+  Applies_To Node_Id 1820
+  1820 applies to modeling_properties.aadl:13:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1813
-   1814 named element modeling_properties.aadl:14:15
+   Owner_Categories List_Id 1815
+   1816 named element modeling_properties.aadl:14:15
     Identifier Node_Id 0
     Category Byte 21
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1815 named element modeling_properties.aadl:14:27
-    Identifier Node_Id 1816
-    1816 identifier modeling_properties.aadl:14:27
+   1817 named element modeling_properties.aadl:14:27
+    Identifier Node_Id 1818
+    1818 identifier modeling_properties.aadl:14:27
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "subcomponent"
      Scope_Entity Node_Id 0
@@ -9677,134 +9687,134 @@ Declarations List_Id 7
     Category Byte 23
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1833 property definition declaration modeling_properties.aadl:16:02
-  Identifier Node_Id 1820
-  1820 identifier modeling_properties.aadl:16:02
-   Corresponding_Entity Node_Id 1833
+ 1835 property definition declaration modeling_properties.aadl:16:02
+  Identifier Node_Id 1822
+  1822 identifier modeling_properties.aadl:16:02
+   Corresponding_Entity Node_Id 1835
    Display_Name Name_Id "Implemented_As"
-   Scope_Entity Node_Id 1776
+   Scope_Entity Node_Id 1778
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1835
-  1835 property type modeling_properties.aadl:16:02
+  Property_Name_Type Node_Id 1837
+  1837 property type modeling_properties.aadl:16:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1823
-   1823 classifier type modeling_properties.aadl:16:18
-    List_Items List_Id 1821
-    1822 classifier category ref modeling_properties.aadl:16:30
+   Property_Type_Designator Node_Id 1825
+   1825 classifier type modeling_properties.aadl:16:18
+    List_Items List_Id 1823
+    1824 classifier category ref modeling_properties.aadl:16:30
      Identifier Node_Id 0
      Category Byte 24
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 1823
-   1823 classifier type modeling_properties.aadl:16:18
-    List_Items List_Id 1821
-    1822 classifier category ref modeling_properties.aadl:16:30
+   Expanded_Type_Designator Node_Id 1825
+   1825 classifier type modeling_properties.aadl:16:18
+    List_Items List_Id 1823
+    1824 classifier category ref modeling_properties.aadl:16:30
      Identifier Node_Id 0
      Category Byte 24
      Component_Cat Byte 13
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1834
-  1834 applies to modeling_properties.aadl:16:02
+  Applies_To Node_Id 1836
+  1836 applies to modeling_properties.aadl:16:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1825
-   1826 named element modeling_properties.aadl:17:15
+   Owner_Categories List_Id 1827
+   1828 named element modeling_properties.aadl:17:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   1827 named element modeling_properties.aadl:17:23
+   1829 named element modeling_properties.aadl:17:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   1828 named element modeling_properties.aadl:17:28
+   1830 named element modeling_properties.aadl:17:28
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   1829 named element modeling_properties.aadl:17:41
+   1831 named element modeling_properties.aadl:17:41
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   1830 named element modeling_properties.aadl:17:49
+   1832 named element modeling_properties.aadl:17:49
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   1831 named element modeling_properties.aadl:17:68
+   1833 named element modeling_properties.aadl:17:68
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   1832 named element modeling_properties.aadl:17:79
+   1834 named element modeling_properties.aadl:17:79
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 1847 property definition declaration modeling_properties.aadl:19:02
-  Identifier Node_Id 1836
-  1836 identifier modeling_properties.aadl:19:02
-   Corresponding_Entity Node_Id 1847
+ 1849 property definition declaration modeling_properties.aadl:19:02
+  Identifier Node_Id 1838
+  1838 identifier modeling_properties.aadl:19:02
+   Corresponding_Entity Node_Id 1849
    Display_Name Name_Id "Prototype_Substitution_Rule"
-   Scope_Entity Node_Id 1776
+   Scope_Entity Node_Id 1778
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1849
-  1849 property type modeling_properties.aadl:19:02
+  Property_Name_Type Node_Id 1851
+  1851 property type modeling_properties.aadl:19:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1837
-   1837 enumeration type modeling_properties.aadl:19:39
-    Identifiers List_Id 1838
-    1839 identifier modeling_properties.aadl:19:52
-     Corresponding_Entity Node_Id 1837
+   Property_Type_Designator Node_Id 1839
+   1839 enumeration type modeling_properties.aadl:19:39
+    Identifiers List_Id 1840
+    1841 identifier modeling_properties.aadl:19:52
+     Corresponding_Entity Node_Id 1839
      Display_Name Name_Id "Classifier_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1840 identifier modeling_properties.aadl:19:70
-     Corresponding_Entity Node_Id 1837
+    1842 identifier modeling_properties.aadl:19:70
+     Corresponding_Entity Node_Id 1839
      Display_Name Name_Id "Type_Extension"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1841 identifier modeling_properties.aadl:19:86
-     Corresponding_Entity Node_Id 1837
+    1843 identifier modeling_properties.aadl:19:86
+     Corresponding_Entity Node_Id 1839
      Display_Name Name_Id "Signature_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
-   Expanded_Type_Designator Node_Id 1837
-   1837 enumeration type modeling_properties.aadl:19:39
-    Identifiers List_Id 1838
-    1839 identifier modeling_properties.aadl:19:52
-     Corresponding_Entity Node_Id 1837
+   Expanded_Type_Designator Node_Id 1839
+   1839 enumeration type modeling_properties.aadl:19:39
+    Identifiers List_Id 1840
+    1841 identifier modeling_properties.aadl:19:52
+     Corresponding_Entity Node_Id 1839
      Display_Name Name_Id "Classifier_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1840 identifier modeling_properties.aadl:19:70
-     Corresponding_Entity Node_Id 1837
+    1842 identifier modeling_properties.aadl:19:70
+     Corresponding_Entity Node_Id 1839
      Display_Name Name_Id "Type_Extension"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    1841 identifier modeling_properties.aadl:19:86
-     Corresponding_Entity Node_Id 1837
+    1843 identifier modeling_properties.aadl:19:86
+     Corresponding_Entity Node_Id 1839
      Display_Name Name_Id "Signature_Match"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1848
-  1848 applies to modeling_properties.aadl:19:02
+  Applies_To Node_Id 1850
+  1850 applies to modeling_properties.aadl:19:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1843
-   1844 named element modeling_properties.aadl:20:15
-    Identifier Node_Id 1845
-    1845 identifier modeling_properties.aadl:20:15
+   Owner_Categories List_Id 1845
+   1846 named element modeling_properties.aadl:20:15
+    Identifier Node_Id 1847
+    1847 identifier modeling_properties.aadl:20:15
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "prototype"
      Scope_Entity Node_Id 0
@@ -9812,3334 +9822,3334 @@ Declarations List_Id 7
     Category Byte 58
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1846 named element modeling_properties.aadl:20:26
+   1848 named element modeling_properties.aadl:20:26
     Identifier Node_Id 0
     Category Byte 21
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-1851 property set timing_properties.aadl:6:01
- Identifier Node_Id 1850
- 1850 identifier timing_properties.aadl:6:14
-  Corresponding_Entity Node_Id 1851
+1853 property set timing_properties.aadl:6:01
+ Identifier Node_Id 1852
+ 1852 identifier timing_properties.aadl:6:14
+  Corresponding_Entity Node_Id 1853
   Display_Name Name_Id "Timing_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 1852
- Declarations List_Id 1864
- 1863 property type declaration timing_properties.aadl:7:02
-  Identifier Node_Id 1853
-  1853 identifier timing_properties.aadl:7:02
-   Corresponding_Entity Node_Id 1863
+ Entity_Scope Node_Id 1854
+ Declarations List_Id 1866
+ 1865 property type declaration timing_properties.aadl:7:02
+  Identifier Node_Id 1855
+  1855 identifier timing_properties.aadl:7:02
+   Corresponding_Entity Node_Id 1865
    Display_Name Name_Id "Time"
-   Scope_Entity Node_Id 1852
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1854
-  1854 integer type timing_properties.aadl:7:13
-   Type_Range Node_Id 1860
-   1860 number range timing_properties.aadl:7:25
-    Lower_Bound Node_Id 1855
-    1855 signed aadlnumber timing_properties.aadl:7:25
-     Number_Value Node_Id 1856
-     1856 literal timing_properties.aadl:7:25
+   Scope_Entity Node_Id 1854
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1856
+  1856 integer type timing_properties.aadl:7:13
+   Type_Range Node_Id 1862
+   1862 number range timing_properties.aadl:7:25
+    Lower_Bound Node_Id 1857
+    1857 signed aadlnumber timing_properties.aadl:7:25
+     Number_Value Node_Id 1858
+     1858 literal timing_properties.aadl:7:25
       Value Value_Id 60
-     Unit_Identifier Node_Id 1857
-     1857 identifier timing_properties.aadl:7:27
-      Corresponding_Entity Node_Id 247
+     Unit_Identifier Node_Id 1859
+     1859 identifier timing_properties.aadl:7:27
+      Corresponding_Entity Node_Id 249
       Display_Name Name_Id "ps"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-    Upper_Bound Node_Id 1859
-    1859 property term timing_properties.aadl:7:30
-     Identifier Node_Id 1858
-     1858 identifier timing_properties.aadl:7:33
+    Upper_Bound Node_Id 1861
+    1861 property term timing_properties.aadl:7:30
+     Identifier Node_Id 1860
+     1860 identifier timing_properties.aadl:7:33
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Max_Time"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 200
+     Entity Node_Id 202
      Property_Set_Identifier Node_Id 0
-   Unit_Designator Node_Id 1862
-   1862 unique property type identifier timing_properties.aadl:7:42
-    Identifier Node_Id 1861
-    1861 identifier timing_properties.aadl:7:48
+   Unit_Designator Node_Id 1864
+   1864 unique property type identifier timing_properties.aadl:7:42
+    Identifier Node_Id 1863
+    1863 identifier timing_properties.aadl:7:48
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Units"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 273
+    Entity Node_Id 275
     Property_Set_Identifier Node_Id 0
- 1869 property type declaration timing_properties.aadl:9:02
-  Identifier Node_Id 1865
-  1865 identifier timing_properties.aadl:9:02
-   Corresponding_Entity Node_Id 1869
+ 1871 property type declaration timing_properties.aadl:9:02
+  Identifier Node_Id 1867
+  1867 identifier timing_properties.aadl:9:02
+   Corresponding_Entity Node_Id 1871
    Display_Name Name_Id "Time_Range"
-   Scope_Entity Node_Id 1852
-   Backend_Node Node_Id 0
-  Property_Type_Designator Node_Id 1866
-  1866 range type timing_properties.aadl:9:19
-   Number_Type Node_Id 1868
-   1868 unique property type identifier timing_properties.aadl:9:25
-    Identifier Node_Id 1867
-    1867 identifier timing_properties.aadl:9:28
+   Scope_Entity Node_Id 1854
+   Backend_Node Node_Id 0
+  Property_Type_Designator Node_Id 1868
+  1868 range type timing_properties.aadl:9:19
+   Number_Type Node_Id 1870
+   1870 unique property type identifier timing_properties.aadl:9:25
+    Identifier Node_Id 1869
+    1869 identifier timing_properties.aadl:9:28
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
- 1876 property definition declaration timing_properties.aadl:11:02
-  Identifier Node_Id 1870
-  1870 identifier timing_properties.aadl:11:02
-   Corresponding_Entity Node_Id 1876
+ 1878 property definition declaration timing_properties.aadl:11:02
+  Identifier Node_Id 1872
+  1872 identifier timing_properties.aadl:11:02
+   Corresponding_Entity Node_Id 1878
    Display_Name Name_Id "Activate_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1878
-  1878 property type timing_properties.aadl:11:02
+  Property_Name_Type Node_Id 1880
+  1880 property type timing_properties.aadl:11:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1872
-   1872 unique property type identifier timing_properties.aadl:11:19
-    Identifier Node_Id 1871
-    1871 identifier timing_properties.aadl:11:21
+   Property_Type_Designator Node_Id 1874
+   1874 unique property type identifier timing_properties.aadl:11:19
+    Identifier Node_Id 1873
+    1873 identifier timing_properties.aadl:11:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2789
-   2789 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2790
-    2790 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2791
-     2791 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2792
-      2792 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2791
+   2791 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2792
+    2792 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2793
+     2793 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2794
+      2794 literal timing_properties.aadl:7:25
        Value Value_Id 122
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2793
-     2793 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2794
-      2794 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2795
+     2795 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2796
+      2796 literal aadl_project.aadl:107:30
        Value Value_Id 123
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1877
-  1877 applies to timing_properties.aadl:11:02
+  Applies_To Node_Id 1879
+  1879 applies to timing_properties.aadl:11:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1874
-   1875 named element timing_properties.aadl:12:15
+   Owner_Categories List_Id 1876
+   1877 named element timing_properties.aadl:12:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 1885 property definition declaration timing_properties.aadl:14:02
-  Identifier Node_Id 1879
-  1879 identifier timing_properties.aadl:14:02
-   Corresponding_Entity Node_Id 1885
+ 1887 property definition declaration timing_properties.aadl:14:02
+  Identifier Node_Id 1881
+  1881 identifier timing_properties.aadl:14:02
+   Corresponding_Entity Node_Id 1887
    Display_Name Name_Id "Activate_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1887
-  1887 property type timing_properties.aadl:14:02
+  Property_Name_Type Node_Id 1889
+  1889 property type timing_properties.aadl:14:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1881
-   1881 unique property type identifier timing_properties.aadl:14:25
-    Identifier Node_Id 1880
-    1880 identifier timing_properties.aadl:14:27
+   Property_Type_Designator Node_Id 1883
+   1883 unique property type identifier timing_properties.aadl:14:25
+    Identifier Node_Id 1882
+    1882 identifier timing_properties.aadl:14:27
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2795
-   2795 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2796
-    2796 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2797
-     2797 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2798
-      2798 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2799
-       2799 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2797
+   2797 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2798
+    2798 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2799
+     2799 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2800
+      2800 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2801
+       2801 literal timing_properties.aadl:7:25
         Value Value_Id 124
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2800
-      2800 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2801
-       2801 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2802
+      2802 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2803
+       2803 literal aadl_project.aadl:107:30
         Value Value_Id 125
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1886
-  1886 applies to timing_properties.aadl:14:02
+  Applies_To Node_Id 1888
+  1888 applies to timing_properties.aadl:14:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1883
-   1884 named element timing_properties.aadl:15:15
+   Owner_Categories List_Id 1885
+   1886 named element timing_properties.aadl:15:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 1899 property definition declaration timing_properties.aadl:17:02
-  Identifier Node_Id 1888
-  1888 identifier timing_properties.aadl:17:02
-   Corresponding_Entity Node_Id 1899
+ 1901 property definition declaration timing_properties.aadl:17:02
+  Identifier Node_Id 1890
+  1890 identifier timing_properties.aadl:17:02
+   Corresponding_Entity Node_Id 1901
    Display_Name Name_Id "Compute_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1901
-  1901 property type timing_properties.aadl:17:02
+  Property_Name_Type Node_Id 1903
+  1903 property type timing_properties.aadl:17:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1890
-   1890 unique property type identifier timing_properties.aadl:17:18
-    Identifier Node_Id 1889
-    1889 identifier timing_properties.aadl:17:20
+   Property_Type_Designator Node_Id 1892
+   1892 unique property type identifier timing_properties.aadl:17:18
+    Identifier Node_Id 1891
+    1891 identifier timing_properties.aadl:17:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2802
-   2802 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2803
-    2803 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2804
-     2804 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2805
-      2805 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2804
+   2804 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2805
+    2805 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2806
+     2806 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2807
+      2807 literal timing_properties.aadl:7:25
        Value Value_Id 126
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2806
-     2806 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2807
-      2807 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2808
+     2808 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2809
+      2809 literal aadl_project.aadl:107:30
        Value Value_Id 127
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1900
-  1900 applies to timing_properties.aadl:17:02
+  Applies_To Node_Id 1902
+  1902 applies to timing_properties.aadl:17:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1892
-   1893 named element timing_properties.aadl:18:15
+   Owner_Categories List_Id 1894
+   1895 named element timing_properties.aadl:18:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1894 named element timing_properties.aadl:18:23
+   1896 named element timing_properties.aadl:18:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   1895 named element timing_properties.aadl:18:31
+   1897 named element timing_properties.aadl:18:31
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1896 named element timing_properties.aadl:18:43
+   1898 named element timing_properties.aadl:18:43
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1897 named element timing_properties.aadl:18:62
+   1899 named element timing_properties.aadl:18:62
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1898 named element timing_properties.aadl:18:74
+   1900 named element timing_properties.aadl:18:74
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1912 property definition declaration timing_properties.aadl:20:02
-  Identifier Node_Id 1902
-  1902 identifier timing_properties.aadl:20:02
-   Corresponding_Entity Node_Id 1912
+ 1914 property definition declaration timing_properties.aadl:20:02
+  Identifier Node_Id 1904
+  1904 identifier timing_properties.aadl:20:02
+   Corresponding_Entity Node_Id 1914
    Display_Name Name_Id "Compute_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1914
-  1914 property type timing_properties.aadl:20:02
+  Property_Name_Type Node_Id 1916
+  1916 property type timing_properties.aadl:20:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1904
-   1904 unique property type identifier timing_properties.aadl:20:24
-    Identifier Node_Id 1903
-    1903 identifier timing_properties.aadl:20:26
+   Property_Type_Designator Node_Id 1906
+   1906 unique property type identifier timing_properties.aadl:20:24
+    Identifier Node_Id 1905
+    1905 identifier timing_properties.aadl:20:26
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2808
-   2808 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2809
-    2809 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2810
-     2810 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2811
-      2811 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2812
-       2812 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2810
+   2810 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2811
+    2811 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2812
+     2812 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2813
+      2813 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2814
+       2814 literal timing_properties.aadl:7:25
         Value Value_Id 128
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2813
-      2813 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2814
-       2814 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2815
+      2815 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2816
+       2816 literal aadl_project.aadl:107:30
         Value Value_Id 129
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1913
-  1913 applies to timing_properties.aadl:20:02
+  Applies_To Node_Id 1915
+  1915 applies to timing_properties.aadl:20:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1906
-   1907 named element timing_properties.aadl:21:15
+   Owner_Categories List_Id 1908
+   1909 named element timing_properties.aadl:21:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1908 named element timing_properties.aadl:21:23
+   1910 named element timing_properties.aadl:21:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   1909 named element timing_properties.aadl:21:31
+   1911 named element timing_properties.aadl:21:31
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   1910 named element timing_properties.aadl:21:43
+   1912 named element timing_properties.aadl:21:43
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   1911 named element timing_properties.aadl:21:55
+   1913 named element timing_properties.aadl:21:55
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1921 property definition declaration timing_properties.aadl:23:02
-  Identifier Node_Id 1915
-  1915 identifier timing_properties.aadl:23:02
-   Corresponding_Entity Node_Id 1921
+ 1923 property definition declaration timing_properties.aadl:23:02
+  Identifier Node_Id 1917
+  1917 identifier timing_properties.aadl:23:02
+   Corresponding_Entity Node_Id 1923
    Display_Name Name_Id "Client_Subprogram_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1923
-  1923 property type timing_properties.aadl:23:02
+  Property_Name_Type Node_Id 1925
+  1925 property type timing_properties.aadl:23:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1917
-   1917 unique property type identifier timing_properties.aadl:23:34
-    Identifier Node_Id 1916
-    1916 identifier timing_properties.aadl:23:36
+   Property_Type_Designator Node_Id 1919
+   1919 unique property type identifier timing_properties.aadl:23:34
+    Identifier Node_Id 1918
+    1918 identifier timing_properties.aadl:23:36
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2815
-   2815 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2816
-    2816 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2817
-     2817 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2818
-      2818 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2819
-       2819 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2817
+   2817 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2818
+    2818 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2819
+     2819 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2820
+      2820 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2821
+       2821 literal timing_properties.aadl:7:25
         Value Value_Id 130
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2820
-      2820 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2821
-       2821 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2822
+      2822 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2823
+       2823 literal aadl_project.aadl:107:30
         Value Value_Id 131
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1922
-  1922 applies to timing_properties.aadl:23:02
+  Applies_To Node_Id 1924
+  1924 applies to timing_properties.aadl:23:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1919
-   1920 named element timing_properties.aadl:24:15
+   Owner_Categories List_Id 1921
+   1922 named element timing_properties.aadl:24:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
- 1930 property definition declaration timing_properties.aadl:26:02
-  Identifier Node_Id 1924
-  1924 identifier timing_properties.aadl:26:02
-   Corresponding_Entity Node_Id 1930
+ 1932 property definition declaration timing_properties.aadl:26:02
+  Identifier Node_Id 1926
+  1926 identifier timing_properties.aadl:26:02
+   Corresponding_Entity Node_Id 1932
    Display_Name Name_Id "Deactivate_Dealing"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1932
-  1932 property type timing_properties.aadl:26:02
+  Property_Name_Type Node_Id 1934
+  1934 property type timing_properties.aadl:26:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1926
-   1926 unique property type identifier timing_properties.aadl:26:20
-    Identifier Node_Id 1925
-    1925 identifier timing_properties.aadl:26:22
+   Property_Type_Designator Node_Id 1928
+   1928 unique property type identifier timing_properties.aadl:26:20
+    Identifier Node_Id 1927
+    1927 identifier timing_properties.aadl:26:22
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2822
-   2822 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2823
-    2823 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2824
-     2824 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2825
-      2825 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2824
+   2824 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2825
+    2825 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2826
+     2826 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2827
+      2827 literal timing_properties.aadl:7:25
        Value Value_Id 132
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2826
-     2826 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2827
-      2827 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2828
+     2828 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2829
+      2829 literal aadl_project.aadl:107:30
        Value Value_Id 133
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1931
-  1931 applies to timing_properties.aadl:26:02
+  Applies_To Node_Id 1933
+  1933 applies to timing_properties.aadl:26:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1928
-   1929 named element timing_properties.aadl:27:15
+   Owner_Categories List_Id 1930
+   1931 named element timing_properties.aadl:27:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 1939 property definition declaration timing_properties.aadl:29:02
-  Identifier Node_Id 1933
-  1933 identifier timing_properties.aadl:29:02
-   Corresponding_Entity Node_Id 1939
+ 1941 property definition declaration timing_properties.aadl:29:02
+  Identifier Node_Id 1935
+  1935 identifier timing_properties.aadl:29:02
+   Corresponding_Entity Node_Id 1941
    Display_Name Name_Id "Deactivate_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1941
-  1941 property type timing_properties.aadl:29:02
+  Property_Name_Type Node_Id 1943
+  1943 property type timing_properties.aadl:29:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1935
-   1935 unique property type identifier timing_properties.aadl:29:27
-    Identifier Node_Id 1934
-    1934 identifier timing_properties.aadl:29:29
+   Property_Type_Designator Node_Id 1937
+   1937 unique property type identifier timing_properties.aadl:29:27
+    Identifier Node_Id 1936
+    1936 identifier timing_properties.aadl:29:29
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2828
-   2828 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2829
-    2829 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2830
-     2830 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2831
-      2831 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2832
-       2832 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2830
+   2830 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2831
+    2831 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2832
+     2832 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2833
+      2833 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2834
+       2834 literal timing_properties.aadl:7:25
         Value Value_Id 134
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2833
-      2833 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2834
-       2834 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2835
+      2835 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2836
+       2836 literal aadl_project.aadl:107:30
         Value Value_Id 135
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1940
-  1940 applies to timing_properties.aadl:29:02
+  Applies_To Node_Id 1942
+  1942 applies to timing_properties.aadl:29:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1937
-   1938 named element timing_properties.aadl:30:15
+   Owner_Categories List_Id 1939
+   1940 named element timing_properties.aadl:30:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 1955 property definition declaration timing_properties.aadl:32:02
-  Identifier Node_Id 1942
-  1942 identifier timing_properties.aadl:32:02
-   Corresponding_Entity Node_Id 1955
+ 1957 property definition declaration timing_properties.aadl:32:02
+  Identifier Node_Id 1944
+  1944 identifier timing_properties.aadl:32:02
+   Corresponding_Entity Node_Id 1957
    Display_Name Name_Id "Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1957
-  1957 property type timing_properties.aadl:32:02
+  Property_Name_Type Node_Id 1959
+  1959 property type timing_properties.aadl:32:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1944
-   1944 unique property type identifier timing_properties.aadl:32:12
-    Identifier Node_Id 1943
-    1943 identifier timing_properties.aadl:32:20
+   Property_Type_Designator Node_Id 1946
+   1946 unique property type identifier timing_properties.aadl:32:12
+    Identifier Node_Id 1945
+    1945 identifier timing_properties.aadl:32:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2835
-   2835 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2836
-    2836 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2837
-     2837 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2838
-      2838 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2837
+   2837 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2838
+    2838 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2839
+     2839 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2840
+      2840 literal timing_properties.aadl:7:25
        Value Value_Id 136
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2839
-     2839 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2840
-      2840 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2841
+     2841 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2842
+      2842 literal aadl_project.aadl:107:30
        Value Value_Id 137
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
-  Default_Value Node_Id 1958
-  1958 property value timing_properties.aadl:32:02
-   Value_Container Node_Id 1851
-   Single_Value Node_Id 1946
-   1946 property term timing_properties.aadl:32:25
-    Identifier Node_Id 1945
-    1945 identifier timing_properties.aadl:32:28
+  Default_Value Node_Id 1960
+  1960 property value timing_properties.aadl:32:02
+   Value_Container Node_Id 1853
+   Single_Value Node_Id 1948
+   1948 property term timing_properties.aadl:32:25
+    Identifier Node_Id 1947
+    1947 identifier timing_properties.aadl:32:28
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Period"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 2064
+    Entity Node_Id 2066
     Property_Set_Identifier Node_Id 0
    Multi_Value List_Id 0
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
-  Applies_To Node_Id 1956
-  1956 applies to timing_properties.aadl:32:02
+  Applies_To Node_Id 1958
+  1958 applies to timing_properties.aadl:32:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1948
-   1949 named element timing_properties.aadl:33:15
+   Owner_Categories List_Id 1950
+   1951 named element timing_properties.aadl:33:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1950 named element timing_properties.aadl:33:23
+   1952 named element timing_properties.aadl:33:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   1951 named element timing_properties.aadl:33:37
+   1953 named element timing_properties.aadl:33:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   1952 named element timing_properties.aadl:33:46
+   1954 named element timing_properties.aadl:33:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   1953 named element timing_properties.aadl:33:54
+   1955 named element timing_properties.aadl:33:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   1954 named element timing_properties.aadl:33:62
+   1956 named element timing_properties.aadl:33:62
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 1966 property definition declaration timing_properties.aadl:35:02
-  Identifier Node_Id 1959
-  1959 identifier timing_properties.aadl:35:02
-   Corresponding_Entity Node_Id 1966
+ 1968 property definition declaration timing_properties.aadl:35:02
+  Identifier Node_Id 1961
+  1961 identifier timing_properties.aadl:35:02
+   Corresponding_Entity Node_Id 1968
    Display_Name Name_Id "First_Dispatch_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1968
-  1968 property type timing_properties.aadl:35:02
+  Property_Name_Type Node_Id 1970
+  1970 property type timing_properties.aadl:35:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1961
-   1961 unique property type identifier timing_properties.aadl:35:23
-    Identifier Node_Id 1960
-    1960 identifier timing_properties.aadl:35:31
+   Property_Type_Designator Node_Id 1963
+   1963 unique property type identifier timing_properties.aadl:35:23
+    Identifier Node_Id 1962
+    1962 identifier timing_properties.aadl:35:31
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2841
-   2841 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2842
-    2842 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2843
-     2843 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2844
-      2844 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2843
+   2843 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2844
+    2844 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2845
+     2845 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2846
+      2846 literal timing_properties.aadl:7:25
        Value Value_Id 138
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2845
-     2845 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2846
-      2846 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2847
+     2847 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2848
+      2848 literal aadl_project.aadl:107:30
        Value Value_Id 139
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1967
-  1967 applies to timing_properties.aadl:35:02
+  Applies_To Node_Id 1969
+  1969 applies to timing_properties.aadl:35:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1963
-   1964 named element timing_properties.aadl:36:15
+   Owner_Categories List_Id 1965
+   1966 named element timing_properties.aadl:36:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1965 named element timing_properties.aadl:36:23
+   1967 named element timing_properties.aadl:36:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
- 1976 property definition declaration timing_properties.aadl:38:02
-  Identifier Node_Id 1969
-  1969 identifier timing_properties.aadl:38:02
-   Corresponding_Entity Node_Id 1976
+ 1978 property definition declaration timing_properties.aadl:38:02
+  Identifier Node_Id 1971
+  1971 identifier timing_properties.aadl:38:02
+   Corresponding_Entity Node_Id 1978
    Display_Name Name_Id "Dispatch_Jitter"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1978
-  1978 property type timing_properties.aadl:38:02
+  Property_Name_Type Node_Id 1980
+  1980 property type timing_properties.aadl:38:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1971
-   1971 unique property type identifier timing_properties.aadl:38:19
-    Identifier Node_Id 1970
-    1970 identifier timing_properties.aadl:38:27
+   Property_Type_Designator Node_Id 1973
+   1973 unique property type identifier timing_properties.aadl:38:19
+    Identifier Node_Id 1972
+    1972 identifier timing_properties.aadl:38:27
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2847
-   2847 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2848
-    2848 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2849
-     2849 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2850
-      2850 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2849
+   2849 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2850
+    2850 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2851
+     2851 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2852
+      2852 literal timing_properties.aadl:7:25
        Value Value_Id 140
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2851
-     2851 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2852
-      2852 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2853
+     2853 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2854
+      2854 literal aadl_project.aadl:107:30
        Value Value_Id 141
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1977
-  1977 applies to timing_properties.aadl:38:02
+  Applies_To Node_Id 1979
+  1979 applies to timing_properties.aadl:38:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1973
-   1974 named element timing_properties.aadl:39:15
+   Owner_Categories List_Id 1975
+   1976 named element timing_properties.aadl:39:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   1975 named element timing_properties.aadl:39:23
+   1977 named element timing_properties.aadl:39:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
- 1985 property definition declaration timing_properties.aadl:41:02
-  Identifier Node_Id 1979
-  1979 identifier timing_properties.aadl:41:02
-   Corresponding_Entity Node_Id 1985
+ 1987 property definition declaration timing_properties.aadl:41:02
+  Identifier Node_Id 1981
+  1981 identifier timing_properties.aadl:41:02
+   Corresponding_Entity Node_Id 1987
    Display_Name Name_Id "Dispatch_Offset"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 1987
-  1987 property type timing_properties.aadl:41:02
+  Property_Name_Type Node_Id 1989
+  1989 property type timing_properties.aadl:41:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1981
-   1981 unique property type identifier timing_properties.aadl:41:19
-    Identifier Node_Id 1980
-    1980 identifier timing_properties.aadl:41:27
+   Property_Type_Designator Node_Id 1983
+   1983 unique property type identifier timing_properties.aadl:41:19
+    Identifier Node_Id 1982
+    1982 identifier timing_properties.aadl:41:27
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2853
-   2853 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2854
-    2854 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2855
-     2855 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2856
-      2856 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2855
+   2855 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2856
+    2856 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2857
+     2857 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2858
+      2858 literal timing_properties.aadl:7:25
        Value Value_Id 142
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2857
-     2857 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2858
-      2858 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2859
+     2859 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2860
+      2860 literal aadl_project.aadl:107:30
        Value Value_Id 143
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1986
-  1986 applies to timing_properties.aadl:41:02
+  Applies_To Node_Id 1988
+  1988 applies to timing_properties.aadl:41:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1983
-   1984 named element timing_properties.aadl:42:15
+   Owner_Categories List_Id 1985
+   1986 named element timing_properties.aadl:42:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 1994 property definition declaration timing_properties.aadl:44:02
-  Identifier Node_Id 1988
-  1988 identifier timing_properties.aadl:44:02
-   Corresponding_Entity Node_Id 1994
+ 1996 property definition declaration timing_properties.aadl:44:02
+  Identifier Node_Id 1990
+  1990 identifier timing_properties.aadl:44:02
+   Corresponding_Entity Node_Id 1996
    Display_Name Name_Id "Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 1996
-  1996 property type timing_properties.aadl:44:02
+  Property_Name_Type Node_Id 1998
+  1998 property type timing_properties.aadl:44:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1990
-   1990 unique property type identifier timing_properties.aadl:44:16
-    Identifier Node_Id 1989
-    1989 identifier timing_properties.aadl:44:18
+   Property_Type_Designator Node_Id 1992
+   1992 unique property type identifier timing_properties.aadl:44:16
+    Identifier Node_Id 1991
+    1991 identifier timing_properties.aadl:44:18
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2859
-   2859 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2860
-    2860 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2861
-     2861 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2862
-      2862 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2861
+   2861 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2862
+    2862 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2863
+     2863 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2864
+      2864 literal timing_properties.aadl:7:25
        Value Value_Id 144
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2863
-     2863 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2864
-      2864 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2865
+     2865 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2866
+      2866 literal aadl_project.aadl:107:30
        Value Value_Id 145
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 1995
-  1995 applies to timing_properties.aadl:44:02
+  Applies_To Node_Id 1997
+  1997 applies to timing_properties.aadl:44:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 1992
-   1993 named element timing_properties.aadl:45:15
+   Owner_Categories List_Id 1994
+   1995 named element timing_properties.aadl:45:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 2003 property definition declaration timing_properties.aadl:47:02
-  Identifier Node_Id 1997
-  1997 identifier timing_properties.aadl:47:02
-   Corresponding_Entity Node_Id 2003
+ 2005 property definition declaration timing_properties.aadl:47:02
+  Identifier Node_Id 1999
+  1999 identifier timing_properties.aadl:47:02
+   Corresponding_Entity Node_Id 2005
    Display_Name Name_Id "Finalize_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2005
-  2005 property type timing_properties.aadl:47:02
+  Property_Name_Type Node_Id 2007
+  2007 property type timing_properties.aadl:47:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 1999
-   1999 unique property type identifier timing_properties.aadl:47:19
-    Identifier Node_Id 1998
-    1998 identifier timing_properties.aadl:47:21
+   Property_Type_Designator Node_Id 2001
+   2001 unique property type identifier timing_properties.aadl:47:19
+    Identifier Node_Id 2000
+    2000 identifier timing_properties.aadl:47:21
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2865
-   2865 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2866
-    2866 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2867
-     2867 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2868
-      2868 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2867
+   2867 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2868
+    2868 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2869
+     2869 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2870
+      2870 literal timing_properties.aadl:7:25
        Value Value_Id 146
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2869
-     2869 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2870
-      2870 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2871
+     2871 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2872
+      2872 literal aadl_project.aadl:107:30
        Value Value_Id 147
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2004
-  2004 applies to timing_properties.aadl:47:02
+  Applies_To Node_Id 2006
+  2006 applies to timing_properties.aadl:47:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2001
-   2002 named element timing_properties.aadl:48:15
+   Owner_Categories List_Id 2003
+   2004 named element timing_properties.aadl:48:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2012 property definition declaration timing_properties.aadl:50:02
-  Identifier Node_Id 2006
-  2006 identifier timing_properties.aadl:50:02
-   Corresponding_Entity Node_Id 2012
+ 2014 property definition declaration timing_properties.aadl:50:02
+  Identifier Node_Id 2008
+  2008 identifier timing_properties.aadl:50:02
+   Corresponding_Entity Node_Id 2014
    Display_Name Name_Id "Finalize_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2014
-  2014 property type timing_properties.aadl:50:02
+  Property_Name_Type Node_Id 2016
+  2016 property type timing_properties.aadl:50:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2008
-   2008 unique property type identifier timing_properties.aadl:50:25
-    Identifier Node_Id 2007
-    2007 identifier timing_properties.aadl:50:27
+   Property_Type_Designator Node_Id 2010
+   2010 unique property type identifier timing_properties.aadl:50:25
+    Identifier Node_Id 2009
+    2009 identifier timing_properties.aadl:50:27
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2871
-   2871 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2872
-    2872 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2873
-     2873 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2874
-      2874 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2875
-       2875 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2873
+   2873 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2874
+    2874 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2875
+     2875 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2876
+      2876 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2877
+       2877 literal timing_properties.aadl:7:25
         Value Value_Id 148
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2876
-      2876 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2877
-       2877 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2878
+      2878 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2879
+       2879 literal aadl_project.aadl:107:30
         Value Value_Id 149
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2013
-  2013 applies to timing_properties.aadl:50:02
+  Applies_To Node_Id 2015
+  2015 applies to timing_properties.aadl:50:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2010
-   2011 named element timing_properties.aadl:51:15
+   Owner_Categories List_Id 2012
+   2013 named element timing_properties.aadl:51:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2021 property definition declaration timing_properties.aadl:53:02
-  Identifier Node_Id 2015
-  2015 identifier timing_properties.aadl:53:02
-   Corresponding_Entity Node_Id 2021
+ 2023 property definition declaration timing_properties.aadl:53:02
+  Identifier Node_Id 2017
+  2017 identifier timing_properties.aadl:53:02
+   Corresponding_Entity Node_Id 2023
    Display_Name Name_Id "Initialize_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2023
-  2023 property type timing_properties.aadl:53:02
+  Property_Name_Type Node_Id 2025
+  2025 property type timing_properties.aadl:53:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2017
-   2017 unique property type identifier timing_properties.aadl:53:21
-    Identifier Node_Id 2016
-    2016 identifier timing_properties.aadl:53:23
+   Property_Type_Designator Node_Id 2019
+   2019 unique property type identifier timing_properties.aadl:53:21
+    Identifier Node_Id 2018
+    2018 identifier timing_properties.aadl:53:23
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2878
-   2878 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2879
-    2879 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2880
-     2880 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2881
-      2881 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2880
+   2880 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2881
+    2881 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2882
+     2882 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2883
+      2883 literal timing_properties.aadl:7:25
        Value Value_Id 150
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2882
-     2882 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2883
-      2883 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2884
+     2884 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2885
+      2885 literal aadl_project.aadl:107:30
        Value Value_Id 151
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2022
-  2022 applies to timing_properties.aadl:53:02
+  Applies_To Node_Id 2024
+  2024 applies to timing_properties.aadl:53:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2019
-   2020 named element timing_properties.aadl:54:15
+   Owner_Categories List_Id 2021
+   2022 named element timing_properties.aadl:54:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2030 property definition declaration timing_properties.aadl:56:02
-  Identifier Node_Id 2024
-  2024 identifier timing_properties.aadl:56:02
-   Corresponding_Entity Node_Id 2030
+ 2032 property definition declaration timing_properties.aadl:56:02
+  Identifier Node_Id 2026
+  2026 identifier timing_properties.aadl:56:02
+   Corresponding_Entity Node_Id 2032
    Display_Name Name_Id "Initialize_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2032
-  2032 property type timing_properties.aadl:56:02
+  Property_Name_Type Node_Id 2034
+  2034 property type timing_properties.aadl:56:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2026
-   2026 unique property type identifier timing_properties.aadl:56:27
-    Identifier Node_Id 2025
-    2025 identifier timing_properties.aadl:56:29
+   Property_Type_Designator Node_Id 2028
+   2028 unique property type identifier timing_properties.aadl:56:27
+    Identifier Node_Id 2027
+    2027 identifier timing_properties.aadl:56:29
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2884
-   2884 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2885
-    2885 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2886
-     2886 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2887
-      2887 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2888
-       2888 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2886
+   2886 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2887
+    2887 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2888
+     2888 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2889
+      2889 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2890
+       2890 literal timing_properties.aadl:7:25
         Value Value_Id 152
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2889
-      2889 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2890
-       2890 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2891
+      2891 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2892
+       2892 literal aadl_project.aadl:107:30
         Value Value_Id 153
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2031
-  2031 applies to timing_properties.aadl:56:02
+  Applies_To Node_Id 2033
+  2033 applies to timing_properties.aadl:56:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2028
-   2029 named element timing_properties.aadl:57:15
+   Owner_Categories List_Id 2030
+   2031 named element timing_properties.aadl:57:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2040 property definition declaration timing_properties.aadl:59:02
-  Identifier Node_Id 2033
-  2033 identifier timing_properties.aadl:59:02
-   Corresponding_Entity Node_Id 2040
+ 2042 property definition declaration timing_properties.aadl:59:02
+  Identifier Node_Id 2035
+  2035 identifier timing_properties.aadl:59:02
+   Corresponding_Entity Node_Id 2042
    Display_Name Name_Id "Load_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2042
-  2042 property type timing_properties.aadl:59:02
+  Property_Name_Type Node_Id 2044
+  2044 property type timing_properties.aadl:59:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2035
-   2035 unique property type identifier timing_properties.aadl:59:15
-    Identifier Node_Id 2034
-    2034 identifier timing_properties.aadl:59:17
+   Property_Type_Designator Node_Id 2037
+   2037 unique property type identifier timing_properties.aadl:59:15
+    Identifier Node_Id 2036
+    2036 identifier timing_properties.aadl:59:17
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2891
-   2891 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2892
-    2892 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2893
-     2893 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2894
-      2894 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2893
+   2893 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2894
+    2894 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2895
+     2895 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2896
+      2896 literal timing_properties.aadl:7:25
        Value Value_Id 154
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2895
-     2895 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2896
-      2896 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2897
+     2897 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2898
+      2898 literal aadl_project.aadl:107:30
        Value Value_Id 155
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2041
-  2041 applies to timing_properties.aadl:59:02
+  Applies_To Node_Id 2043
+  2043 applies to timing_properties.aadl:59:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2037
-   2038 named element timing_properties.aadl:60:15
+   Owner_Categories List_Id 2039
+   2040 named element timing_properties.aadl:60:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2039 named element timing_properties.aadl:60:24
+   2041 named element timing_properties.aadl:60:24
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2050 property definition declaration timing_properties.aadl:62:02
-  Identifier Node_Id 2043
-  2043 identifier timing_properties.aadl:62:02
-   Corresponding_Entity Node_Id 2050
+ 2052 property definition declaration timing_properties.aadl:62:02
+  Identifier Node_Id 2045
+  2045 identifier timing_properties.aadl:62:02
+   Corresponding_Entity Node_Id 2052
    Display_Name Name_Id "Load_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2052
-  2052 property type timing_properties.aadl:62:02
+  Property_Name_Type Node_Id 2054
+  2054 property type timing_properties.aadl:62:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2045
-   2045 unique property type identifier timing_properties.aadl:62:11
-    Identifier Node_Id 2044
-    2044 identifier timing_properties.aadl:62:13
+   Property_Type_Designator Node_Id 2047
+   2047 unique property type identifier timing_properties.aadl:62:11
+    Identifier Node_Id 2046
+    2046 identifier timing_properties.aadl:62:13
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2897
-   2897 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2898
-    2898 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2899
-     2899 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2900
-      2900 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2901
-       2901 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2899
+   2899 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2900
+    2900 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2901
+     2901 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2902
+      2902 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2903
+       2903 literal timing_properties.aadl:7:25
         Value Value_Id 156
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2902
-      2902 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2903
-       2903 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2904
+      2904 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2905
+       2905 literal aadl_project.aadl:107:30
         Value Value_Id 157
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2051
-  2051 applies to timing_properties.aadl:62:02
+  Applies_To Node_Id 2053
+  2053 applies to timing_properties.aadl:62:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2047
-   2048 named element timing_properties.aadl:63:15
+   Owner_Categories List_Id 2049
+   2050 named element timing_properties.aadl:63:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2049 named element timing_properties.aadl:63:24
+   2051 named element timing_properties.aadl:63:24
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2064 property definition declaration timing_properties.aadl:65:02
-  Identifier Node_Id 2053
-  2053 identifier timing_properties.aadl:65:02
-   Corresponding_Entity Node_Id 2064
+ 2066 property definition declaration timing_properties.aadl:65:02
+  Identifier Node_Id 2055
+  2055 identifier timing_properties.aadl:65:02
+   Corresponding_Entity Node_Id 2066
    Display_Name Name_Id "Period"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2066
-  2066 property type timing_properties.aadl:65:02
+  Property_Name_Type Node_Id 2068
+  2068 property type timing_properties.aadl:65:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2055
-   2055 unique property type identifier timing_properties.aadl:65:10
-    Identifier Node_Id 2054
-    2054 identifier timing_properties.aadl:65:18
+   Property_Type_Designator Node_Id 2057
+   2057 unique property type identifier timing_properties.aadl:65:10
+    Identifier Node_Id 2056
+    2056 identifier timing_properties.aadl:65:18
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2904
-   2904 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2905
-    2905 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2906
-     2906 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2907
-      2907 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2906
+   2906 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2907
+    2907 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2908
+     2908 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2909
+      2909 literal timing_properties.aadl:7:25
        Value Value_Id 158
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2908
-     2908 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2909
-      2909 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2910
+     2910 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2911
+      2911 literal aadl_project.aadl:107:30
        Value Value_Id 159
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2065
-  2065 applies to timing_properties.aadl:65:02
+  Applies_To Node_Id 2067
+  2067 applies to timing_properties.aadl:65:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2057
-   2058 named element timing_properties.aadl:66:15
+   Owner_Categories List_Id 2059
+   2060 named element timing_properties.aadl:66:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2059 named element timing_properties.aadl:66:23
+   2061 named element timing_properties.aadl:66:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   2060 named element timing_properties.aadl:66:37
+   2062 named element timing_properties.aadl:66:37
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2061 named element timing_properties.aadl:66:46
+   2063 named element timing_properties.aadl:66:46
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   2062 named element timing_properties.aadl:66:54
+   2064 named element timing_properties.aadl:66:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2063 named element timing_properties.aadl:66:62
+   2065 named element timing_properties.aadl:66:62
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 2073 property definition declaration timing_properties.aadl:68:02
-  Identifier Node_Id 2067
-  2067 identifier timing_properties.aadl:68:02
-   Corresponding_Entity Node_Id 2073
+ 2075 property definition declaration timing_properties.aadl:68:02
+  Identifier Node_Id 2069
+  2069 identifier timing_properties.aadl:68:02
+   Corresponding_Entity Node_Id 2075
    Display_Name Name_Id "Recover_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2075
-  2075 property type timing_properties.aadl:68:02
+  Property_Name_Type Node_Id 2077
+  2077 property type timing_properties.aadl:68:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2069
-   2069 unique property type identifier timing_properties.aadl:68:18
-    Identifier Node_Id 2068
-    2068 identifier timing_properties.aadl:68:20
+   Property_Type_Designator Node_Id 2071
+   2071 unique property type identifier timing_properties.aadl:68:18
+    Identifier Node_Id 2070
+    2070 identifier timing_properties.aadl:68:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2910
-   2910 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2911
-    2911 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2912
-     2912 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2913
-      2913 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2912
+   2912 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2913
+    2913 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2914
+     2914 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2915
+      2915 literal timing_properties.aadl:7:25
        Value Value_Id 160
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2914
-     2914 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2915
-      2915 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2916
+     2916 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2917
+      2917 literal aadl_project.aadl:107:30
        Value Value_Id 161
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2074
-  2074 applies to timing_properties.aadl:68:02
+  Applies_To Node_Id 2076
+  2076 applies to timing_properties.aadl:68:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2071
-   2072 named element timing_properties.aadl:69:15
+   Owner_Categories List_Id 2073
+   2074 named element timing_properties.aadl:69:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2082 property definition declaration timing_properties.aadl:71:02
-  Identifier Node_Id 2076
-  2076 identifier timing_properties.aadl:71:02
-   Corresponding_Entity Node_Id 2082
+ 2084 property definition declaration timing_properties.aadl:71:02
+  Identifier Node_Id 2078
+  2078 identifier timing_properties.aadl:71:02
+   Corresponding_Entity Node_Id 2084
    Display_Name Name_Id "Recover_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2084
-  2084 property type timing_properties.aadl:71:02
+  Property_Name_Type Node_Id 2086
+  2086 property type timing_properties.aadl:71:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2078
-   2078 unique property type identifier timing_properties.aadl:71:24
-    Identifier Node_Id 2077
-    2077 identifier timing_properties.aadl:71:26
+   Property_Type_Designator Node_Id 2080
+   2080 unique property type identifier timing_properties.aadl:71:24
+    Identifier Node_Id 2079
+    2079 identifier timing_properties.aadl:71:26
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2916
-   2916 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2917
-    2917 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2918
-     2918 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2919
-      2919 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2920
-       2920 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2918
+   2918 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2919
+    2919 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2920
+     2920 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2921
+      2921 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2922
+       2922 literal timing_properties.aadl:7:25
         Value Value_Id 162
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2921
-      2921 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2922
-       2922 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2923
+      2923 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2924
+       2924 literal aadl_project.aadl:107:30
         Value Value_Id 163
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2083
-  2083 applies to timing_properties.aadl:71:02
+  Applies_To Node_Id 2085
+  2085 applies to timing_properties.aadl:71:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2080
-   2081 named element timing_properties.aadl:72:15
+   Owner_Categories List_Id 2082
+   2083 named element timing_properties.aadl:72:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2094 property definition declaration timing_properties.aadl:74:02
-  Identifier Node_Id 2085
-  2085 identifier timing_properties.aadl:74:02
-   Corresponding_Entity Node_Id 2094
+ 2096 property definition declaration timing_properties.aadl:74:02
+  Identifier Node_Id 2087
+  2087 identifier timing_properties.aadl:74:02
+   Corresponding_Entity Node_Id 2096
    Display_Name Name_Id "Startup_Deadline"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2096
-  2096 property type timing_properties.aadl:74:02
+  Property_Name_Type Node_Id 2098
+  2098 property type timing_properties.aadl:74:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2087
-   2087 unique property type identifier timing_properties.aadl:74:18
-    Identifier Node_Id 2086
-    2086 identifier timing_properties.aadl:74:20
+   Property_Type_Designator Node_Id 2089
+   2089 unique property type identifier timing_properties.aadl:74:18
+    Identifier Node_Id 2088
+    2088 identifier timing_properties.aadl:74:20
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2923
-   2923 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2924
-    2924 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2925
-     2925 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2926
-      2926 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2925
+   2925 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2926
+    2926 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2927
+     2927 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2928
+      2928 literal timing_properties.aadl:7:25
        Value Value_Id 164
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2927
-     2927 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2928
-      2928 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2929
+     2929 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2930
+      2930 literal aadl_project.aadl:107:30
        Value Value_Id 165
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2095
-  2095 applies to timing_properties.aadl:74:02
+  Applies_To Node_Id 2097
+  2097 applies to timing_properties.aadl:74:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2089
-   2090 named element timing_properties.aadl:75:15
+   Owner_Categories List_Id 2091
+   2092 named element timing_properties.aadl:75:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2091 named element timing_properties.aadl:75:26
+   2093 named element timing_properties.aadl:75:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   2092 named element timing_properties.aadl:75:45
+   2094 named element timing_properties.aadl:75:45
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2093 named element timing_properties.aadl:75:54
+   2095 named element timing_properties.aadl:75:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2106 property definition declaration timing_properties.aadl:77:02
-  Identifier Node_Id 2097
-  2097 identifier timing_properties.aadl:77:02
-   Corresponding_Entity Node_Id 2106
+ 2108 property definition declaration timing_properties.aadl:77:02
+  Identifier Node_Id 2099
+  2099 identifier timing_properties.aadl:77:02
+   Corresponding_Entity Node_Id 2108
    Display_Name Name_Id "Startup_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2108
-  2108 property type timing_properties.aadl:77:02
+  Property_Name_Type Node_Id 2110
+  2110 property type timing_properties.aadl:77:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2099
-   2099 unique property type identifier timing_properties.aadl:77:24
-    Identifier Node_Id 2098
-    2098 identifier timing_properties.aadl:77:26
+   Property_Type_Designator Node_Id 2101
+   2101 unique property type identifier timing_properties.aadl:77:24
+    Identifier Node_Id 2100
+    2100 identifier timing_properties.aadl:77:26
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2929
-   2929 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2930
-    2930 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2931
-     2931 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2932
-      2932 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2933
-       2933 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2931
+   2931 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2932
+    2932 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2933
+     2933 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2934
+      2934 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2935
+       2935 literal timing_properties.aadl:7:25
         Value Value_Id 166
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2934
-      2934 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2935
-       2935 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2936
+      2936 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2937
+       2937 literal aadl_project.aadl:107:30
         Value Value_Id 167
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2107
-  2107 applies to timing_properties.aadl:77:02
+  Applies_To Node_Id 2109
+  2109 applies to timing_properties.aadl:77:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2101
-   2102 named element timing_properties.aadl:78:15
+   Owner_Categories List_Id 2103
+   2104 named element timing_properties.aadl:78:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   2103 named element timing_properties.aadl:78:34
+   2105 named element timing_properties.aadl:78:34
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2104 named element timing_properties.aadl:78:45
+   2106 named element timing_properties.aadl:78:45
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2105 named element timing_properties.aadl:78:54
+   2107 named element timing_properties.aadl:78:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2116 property definition declaration timing_properties.aadl:80:02
-  Identifier Node_Id 2109
-  2109 identifier timing_properties.aadl:80:02
-   Corresponding_Entity Node_Id 2116
+ 2118 property definition declaration timing_properties.aadl:80:02
+  Identifier Node_Id 2111
+  2111 identifier timing_properties.aadl:80:02
+   Corresponding_Entity Node_Id 2118
    Display_Name Name_Id "Clock_Jitter"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2118
-  2118 property type timing_properties.aadl:80:02
+  Property_Name_Type Node_Id 2120
+  2120 property type timing_properties.aadl:80:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2111
-   2111 unique property type identifier timing_properties.aadl:80:14
-    Identifier Node_Id 2110
-    2110 identifier timing_properties.aadl:80:16
+   Property_Type_Designator Node_Id 2113
+   2113 unique property type identifier timing_properties.aadl:80:14
+    Identifier Node_Id 2112
+    2112 identifier timing_properties.aadl:80:16
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2936
-   2936 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2937
-    2937 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2938
-     2938 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2939
-      2939 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2938
+   2938 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2939
+    2939 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2940
+     2940 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2941
+      2941 literal timing_properties.aadl:7:25
        Value Value_Id 168
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2940
-     2940 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2941
-      2941 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2942
+     2942 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2943
+      2943 literal aadl_project.aadl:107:30
        Value Value_Id 169
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2117
-  2117 applies to timing_properties.aadl:80:02
+  Applies_To Node_Id 2119
+  2119 applies to timing_properties.aadl:80:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2113
-   2114 named element timing_properties.aadl:81:15
+   Owner_Categories List_Id 2115
+   2116 named element timing_properties.aadl:81:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2115 named element timing_properties.aadl:81:26
+   2117 named element timing_properties.aadl:81:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2126 property definition declaration timing_properties.aadl:83:02
-  Identifier Node_Id 2119
-  2119 identifier timing_properties.aadl:83:02
-   Corresponding_Entity Node_Id 2126
+ 2128 property definition declaration timing_properties.aadl:83:02
+  Identifier Node_Id 2121
+  2121 identifier timing_properties.aadl:83:02
+   Corresponding_Entity Node_Id 2128
    Display_Name Name_Id "Clock_Period"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2128
-  2128 property type timing_properties.aadl:83:02
+  Property_Name_Type Node_Id 2130
+  2130 property type timing_properties.aadl:83:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2121
-   2121 unique property type identifier timing_properties.aadl:83:14
-    Identifier Node_Id 2120
-    2120 identifier timing_properties.aadl:83:16
+   Property_Type_Designator Node_Id 2123
+   2123 unique property type identifier timing_properties.aadl:83:14
+    Identifier Node_Id 2122
+    2122 identifier timing_properties.aadl:83:16
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2942
-   2942 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2943
-    2943 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2944
-     2944 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2945
-      2945 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2944
+   2944 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2945
+    2945 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2946
+     2946 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2947
+      2947 literal timing_properties.aadl:7:25
        Value Value_Id 170
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2946
-     2946 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2947
-      2947 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2948
+     2948 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2949
+      2949 literal aadl_project.aadl:107:30
        Value Value_Id 171
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2127
-  2127 applies to timing_properties.aadl:83:02
+  Applies_To Node_Id 2129
+  2129 applies to timing_properties.aadl:83:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2123
-   2124 named element timing_properties.aadl:84:15
+   Owner_Categories List_Id 2125
+   2126 named element timing_properties.aadl:84:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2125 named element timing_properties.aadl:84:26
+   2127 named element timing_properties.aadl:84:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2136 property definition declaration timing_properties.aadl:86:02
-  Identifier Node_Id 2129
-  2129 identifier timing_properties.aadl:86:02
-   Corresponding_Entity Node_Id 2136
+ 2138 property definition declaration timing_properties.aadl:86:02
+  Identifier Node_Id 2131
+  2131 identifier timing_properties.aadl:86:02
+   Corresponding_Entity Node_Id 2138
    Display_Name Name_Id "Clock_Period_Range"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2138
-  2138 property type timing_properties.aadl:86:02
+  Property_Name_Type Node_Id 2140
+  2140 property type timing_properties.aadl:86:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2131
-   2131 unique property type identifier timing_properties.aadl:86:20
-    Identifier Node_Id 2130
-    2130 identifier timing_properties.aadl:86:22
+   Property_Type_Designator Node_Id 2133
+   2133 unique property type identifier timing_properties.aadl:86:20
+    Identifier Node_Id 2132
+    2132 identifier timing_properties.aadl:86:22
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2948
-   2948 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2949
-    2949 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2950
-     2950 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2951
-      2951 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2952
-       2952 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2950
+   2950 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2951
+    2951 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2952
+     2952 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2953
+      2953 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2954
+       2954 literal timing_properties.aadl:7:25
         Value Value_Id 172
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2953
-      2953 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2954
-       2954 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2955
+      2955 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2956
+       2956 literal aadl_project.aadl:107:30
         Value Value_Id 173
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2137
-  2137 applies to timing_properties.aadl:86:02
+  Applies_To Node_Id 2139
+  2139 applies to timing_properties.aadl:86:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2133
-   2134 named element timing_properties.aadl:87:15
+   Owner_Categories List_Id 2135
+   2136 named element timing_properties.aadl:87:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2135 named element timing_properties.aadl:87:26
+   2137 named element timing_properties.aadl:87:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2145 property definition declaration timing_properties.aadl:89:02
-  Identifier Node_Id 2139
-  2139 identifier timing_properties.aadl:89:02
-   Corresponding_Entity Node_Id 2145
+ 2147 property definition declaration timing_properties.aadl:89:02
+  Identifier Node_Id 2141
+  2141 identifier timing_properties.aadl:89:02
+   Corresponding_Entity Node_Id 2147
    Display_Name Name_Id "Process_Swap_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2147
-  2147 property type timing_properties.aadl:89:02
+  Property_Name_Type Node_Id 2149
+  2149 property type timing_properties.aadl:89:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2141
-   2141 unique property type identifier timing_properties.aadl:89:29
-    Identifier Node_Id 2140
-    2140 identifier timing_properties.aadl:89:31
+   Property_Type_Designator Node_Id 2143
+   2143 unique property type identifier timing_properties.aadl:89:29
+    Identifier Node_Id 2142
+    2142 identifier timing_properties.aadl:89:31
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2955
-   2955 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2956
-    2956 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2957
-     2957 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2958
-      2958 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2959
-       2959 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2957
+   2957 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2958
+    2958 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2959
+     2959 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2960
+      2960 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2961
+       2961 literal timing_properties.aadl:7:25
         Value Value_Id 174
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2960
-      2960 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2961
-       2961 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2962
+      2962 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2963
+       2963 literal aadl_project.aadl:107:30
         Value Value_Id 175
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2146
-  2146 applies to timing_properties.aadl:89:02
+  Applies_To Node_Id 2148
+  2148 applies to timing_properties.aadl:89:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2143
-   2144 named element timing_properties.aadl:90:15
+   Owner_Categories List_Id 2145
+   2146 named element timing_properties.aadl:90:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 2161 property definition declaration timing_properties.aadl:92:02
-  Identifier Node_Id 2148
-  2148 identifier timing_properties.aadl:92:02
-   Corresponding_Entity Node_Id 2161
+ 2163 property definition declaration timing_properties.aadl:92:02
+  Identifier Node_Id 2150
+  2150 identifier timing_properties.aadl:92:02
+   Corresponding_Entity Node_Id 2163
    Display_Name Name_Id "Reference_Processor"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2163
-  2163 property type timing_properties.aadl:92:02
+  Property_Name_Type Node_Id 2165
+  2165 property type timing_properties.aadl:92:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2151
-   2151 classifier type timing_properties.aadl:92:31
-    List_Items List_Id 2149
-    2150 classifier category ref timing_properties.aadl:92:43
+   Property_Type_Designator Node_Id 2153
+   2153 classifier type timing_properties.aadl:92:31
+    List_Items List_Id 2151
+    2152 classifier category ref timing_properties.aadl:92:43
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2151
-   2151 classifier type timing_properties.aadl:92:31
-    List_Items List_Id 2149
-    2150 classifier category ref timing_properties.aadl:92:43
+   Expanded_Type_Designator Node_Id 2153
+   2153 classifier type timing_properties.aadl:92:31
+    List_Items List_Id 2151
+    2152 classifier category ref timing_properties.aadl:92:43
      Identifier Node_Id 0
      Category Byte 11
      Component_Cat Byte 8
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2162
-  2162 applies to timing_properties.aadl:92:02
+  Applies_To Node_Id 2164
+  2164 applies to timing_properties.aadl:92:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2153
-   2154 named element timing_properties.aadl:93:15
+   Owner_Categories List_Id 2155
+   2156 named element timing_properties.aadl:93:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2155 named element timing_properties.aadl:93:27
+   2157 named element timing_properties.aadl:93:27
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 3
     Classifier_Ref Node_Id 0
-   2156 named element timing_properties.aadl:93:45
+   2158 named element timing_properties.aadl:93:45
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2157 named element timing_properties.aadl:93:53
+   2159 named element timing_properties.aadl:93:53
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   2158 named element timing_properties.aadl:93:67
+   2160 named element timing_properties.aadl:93:67
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2159 named element timing_properties.aadl:93:76
+   2161 named element timing_properties.aadl:93:76
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2160 named element timing_properties.aadl:93:84
+   2162 named element timing_properties.aadl:93:84
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2170 property definition declaration timing_properties.aadl:95:02
-  Identifier Node_Id 2164
-  2164 identifier timing_properties.aadl:95:02
-   Corresponding_Entity Node_Id 2170
+ 2172 property definition declaration timing_properties.aadl:95:02
+  Identifier Node_Id 2166
+  2166 identifier timing_properties.aadl:95:02
+   Corresponding_Entity Node_Id 2172
    Display_Name Name_Id "Scaling_Factor"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2172
-  2172 property type timing_properties.aadl:95:02
+  Property_Name_Type Node_Id 2174
+  2174 property type timing_properties.aadl:95:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2165
-   2165 real type timing_properties.aadl:95:26
+   Property_Type_Designator Node_Id 2167
+   2167 real type timing_properties.aadl:95:26
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
-   Expanded_Type_Designator Node_Id 2962
-   2962 real type timing_properties.aadl:95:26
+   Expanded_Type_Designator Node_Id 2964
+   2964 real type timing_properties.aadl:95:26
     Type_Range Node_Id 0
     Unit_Designator Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2171
-  2171 applies to timing_properties.aadl:95:02
+  Applies_To Node_Id 2173
+  2173 applies to timing_properties.aadl:95:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2167
-   2168 named element timing_properties.aadl:96:15
+   Owner_Categories List_Id 2169
+   2170 named element timing_properties.aadl:96:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2169 named element timing_properties.aadl:96:26
+   2171 named element timing_properties.aadl:96:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2179 property definition declaration timing_properties.aadl:98:02
-  Identifier Node_Id 2173
-  2173 identifier timing_properties.aadl:98:02
-   Corresponding_Entity Node_Id 2179
+ 2181 property definition declaration timing_properties.aadl:98:02
+  Identifier Node_Id 2175
+  2175 identifier timing_properties.aadl:98:02
+   Corresponding_Entity Node_Id 2181
    Display_Name Name_Id "Scheduler_Quantum"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2181
-  2181 property type timing_properties.aadl:98:02
+  Property_Name_Type Node_Id 2183
+  2183 property type timing_properties.aadl:98:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2175
-   2175 unique property type identifier timing_properties.aadl:98:21
-    Identifier Node_Id 2174
-    2174 identifier timing_properties.aadl:98:29
+   Property_Type_Designator Node_Id 2177
+   2177 unique property type identifier timing_properties.aadl:98:21
+    Identifier Node_Id 2176
+    2176 identifier timing_properties.aadl:98:29
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2963
-   2963 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2964
-    2964 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2965
-     2965 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2966
-      2966 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2965
+   2965 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2966
+    2966 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2967
+     2967 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2968
+      2968 literal timing_properties.aadl:7:25
        Value Value_Id 176
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2967
-     2967 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2968
-      2968 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2969
+     2969 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2970
+      2970 literal aadl_project.aadl:107:30
        Value Value_Id 177
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2180
-  2180 applies to timing_properties.aadl:98:02
+  Applies_To Node_Id 2182
+  2182 applies to timing_properties.aadl:98:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2177
-   2178 named element timing_properties.aadl:99:15
+   Owner_Categories List_Id 2179
+   2180 named element timing_properties.aadl:99:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
- 2189 property definition declaration timing_properties.aadl:101:02
-  Identifier Node_Id 2182
-  2182 identifier timing_properties.aadl:101:02
-   Corresponding_Entity Node_Id 2189
+ 2191 property definition declaration timing_properties.aadl:101:02
+  Identifier Node_Id 2184
+  2184 identifier timing_properties.aadl:101:02
+   Corresponding_Entity Node_Id 2191
    Display_Name Name_Id "Thread_Swap_Execution_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2191
-  2191 property type timing_properties.aadl:101:02
+  Property_Name_Type Node_Id 2193
+  2193 property type timing_properties.aadl:101:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2184
-   2184 unique property type identifier timing_properties.aadl:101:28
-    Identifier Node_Id 2183
-    2183 identifier timing_properties.aadl:101:30
+   Property_Type_Designator Node_Id 2186
+   2186 unique property type identifier timing_properties.aadl:101:28
+    Identifier Node_Id 2185
+    2185 identifier timing_properties.aadl:101:30
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time_Range"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1869
+    Entity Node_Id 1871
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2969
-   2969 range type timing_properties.aadl:9:19
-    Number_Type Node_Id 2970
-    2970 integer type timing_properties.aadl:7:13
-     Type_Range Node_Id 2971
-     2971 number range timing_properties.aadl:7:25
-      Lower_Bound Node_Id 2972
-      2972 signed aadlnumber timing_properties.aadl:7:25
-       Number_Value Node_Id 2973
-       2973 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2971
+   2971 range type timing_properties.aadl:9:19
+    Number_Type Node_Id 2972
+    2972 integer type timing_properties.aadl:7:13
+     Type_Range Node_Id 2973
+     2973 number range timing_properties.aadl:7:25
+      Lower_Bound Node_Id 2974
+      2974 signed aadlnumber timing_properties.aadl:7:25
+       Number_Value Node_Id 2975
+       2975 literal timing_properties.aadl:7:25
         Value Value_Id 178
-       Unit_Identifier Node_Id 1857
-       1857 identifier timing_properties.aadl:7:27
-        Corresponding_Entity Node_Id 247
+       Unit_Identifier Node_Id 1859
+       1859 identifier timing_properties.aadl:7:27
+        Corresponding_Entity Node_Id 249
         Display_Name Name_Id "ps"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-      Upper_Bound Node_Id 2974
-      2974 signed aadlnumber aadl_project.aadl:105:30
-       Number_Value Node_Id 2975
-       2975 literal aadl_project.aadl:105:30
+      Upper_Bound Node_Id 2976
+      2976 signed aadlnumber aadl_project.aadl:107:30
+       Number_Value Node_Id 2977
+       2977 literal aadl_project.aadl:107:30
         Value Value_Id 179
-       Unit_Identifier Node_Id 199
-       199 identifier aadl_project.aadl:105:35
-        Corresponding_Entity Node_Id 270
+       Unit_Identifier Node_Id 201
+       201 identifier aadl_project.aadl:107:35
+        Corresponding_Entity Node_Id 272
         Display_Name Name_Id "hr"
         Scope_Entity Node_Id 0
         Backend_Node Node_Id 0
-     Unit_Designator Node_Id 1862
-     1862 unique property type identifier timing_properties.aadl:7:42
-      Identifier Node_Id 1861
-      1861 identifier timing_properties.aadl:7:48
+     Unit_Designator Node_Id 1864
+     1864 unique property type identifier timing_properties.aadl:7:42
+      Identifier Node_Id 1863
+      1863 identifier timing_properties.aadl:7:48
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Units"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      Entity Node_Id 273
+      Entity Node_Id 275
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2190
-  2190 applies to timing_properties.aadl:101:02
+  Applies_To Node_Id 2192
+  2192 applies to timing_properties.aadl:101:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2186
-   2187 named element timing_properties.aadl:102:15
+   Owner_Categories List_Id 2188
+   2189 named element timing_properties.aadl:102:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2188 named element timing_properties.aadl:102:26
+   2190 named element timing_properties.aadl:102:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2199 property definition declaration timing_properties.aadl:104:02
-  Identifier Node_Id 2192
-  2192 identifier timing_properties.aadl:104:02
-   Corresponding_Entity Node_Id 2199
+ 2201 property definition declaration timing_properties.aadl:104:02
+  Identifier Node_Id 2194
+  2194 identifier timing_properties.aadl:104:02
+   Corresponding_Entity Node_Id 2201
    Display_Name Name_Id "Frame_Period"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2201
-  2201 property type timing_properties.aadl:104:02
+  Property_Name_Type Node_Id 2203
+  2203 property type timing_properties.aadl:104:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2194
-   2194 unique property type identifier timing_properties.aadl:104:14
-    Identifier Node_Id 2193
-    2193 identifier timing_properties.aadl:104:16
+   Property_Type_Designator Node_Id 2196
+   2196 unique property type identifier timing_properties.aadl:104:14
+    Identifier Node_Id 2195
+    2195 identifier timing_properties.aadl:104:16
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2976
-   2976 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2977
-    2977 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2978
-     2978 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2979
-      2979 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2978
+   2978 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2979
+    2979 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2980
+     2980 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2981
+      2981 literal timing_properties.aadl:7:25
        Value Value_Id 180
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2980
-     2980 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2981
-      2981 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2982
+     2982 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2983
+      2983 literal aadl_project.aadl:107:30
        Value Value_Id 181
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2200
-  2200 applies to timing_properties.aadl:104:02
+  Applies_To Node_Id 2202
+  2202 applies to timing_properties.aadl:104:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2196
-   2197 named element timing_properties.aadl:105:15
+   Owner_Categories List_Id 2198
+   2199 named element timing_properties.aadl:105:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2198 named element timing_properties.aadl:105:26
+   2200 named element timing_properties.aadl:105:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 2209 property definition declaration timing_properties.aadl:107:02
-  Identifier Node_Id 2202
-  2202 identifier timing_properties.aadl:107:02
-   Corresponding_Entity Node_Id 2209
+ 2211 property definition declaration timing_properties.aadl:107:02
+  Identifier Node_Id 2204
+  2204 identifier timing_properties.aadl:107:02
+   Corresponding_Entity Node_Id 2211
    Display_Name Name_Id "Slot_Time"
-   Scope_Entity Node_Id 1852
+   Scope_Entity Node_Id 1854
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2211
-  2211 property type timing_properties.aadl:107:02
+  Property_Name_Type Node_Id 2213
+  2213 property type timing_properties.aadl:107:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2204
-   2204 unique property type identifier timing_properties.aadl:107:11
-    Identifier Node_Id 2203
-    2203 identifier timing_properties.aadl:107:13
+   Property_Type_Designator Node_Id 2206
+   2206 unique property type identifier timing_properties.aadl:107:11
+    Identifier Node_Id 2205
+    2205 identifier timing_properties.aadl:107:13
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Time"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 1863
+    Entity Node_Id 1865
     Property_Set_Identifier Node_Id 0
-   Expanded_Type_Designator Node_Id 2982
-   2982 integer type timing_properties.aadl:7:13
-    Type_Range Node_Id 2983
-    2983 number range timing_properties.aadl:7:25
-     Lower_Bound Node_Id 2984
-     2984 signed aadlnumber timing_properties.aadl:7:25
-      Number_Value Node_Id 2985
-      2985 literal timing_properties.aadl:7:25
+   Expanded_Type_Designator Node_Id 2984
+   2984 integer type timing_properties.aadl:7:13
+    Type_Range Node_Id 2985
+    2985 number range timing_properties.aadl:7:25
+     Lower_Bound Node_Id 2986
+     2986 signed aadlnumber timing_properties.aadl:7:25
+      Number_Value Node_Id 2987
+      2987 literal timing_properties.aadl:7:25
        Value Value_Id 182
-      Unit_Identifier Node_Id 1857
-      1857 identifier timing_properties.aadl:7:27
-       Corresponding_Entity Node_Id 247
+      Unit_Identifier Node_Id 1859
+      1859 identifier timing_properties.aadl:7:27
+       Corresponding_Entity Node_Id 249
        Display_Name Name_Id "ps"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-     Upper_Bound Node_Id 2986
-     2986 signed aadlnumber aadl_project.aadl:105:30
-      Number_Value Node_Id 2987
-      2987 literal aadl_project.aadl:105:30
+     Upper_Bound Node_Id 2988
+     2988 signed aadlnumber aadl_project.aadl:107:30
+      Number_Value Node_Id 2989
+      2989 literal aadl_project.aadl:107:30
        Value Value_Id 183
-      Unit_Identifier Node_Id 199
-      199 identifier aadl_project.aadl:105:35
-       Corresponding_Entity Node_Id 270
+      Unit_Identifier Node_Id 201
+      201 identifier aadl_project.aadl:107:35
+       Corresponding_Entity Node_Id 272
        Display_Name Name_Id "hr"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-    Unit_Designator Node_Id 1862
-    1862 unique property type identifier timing_properties.aadl:7:42
-     Identifier Node_Id 1861
-     1861 identifier timing_properties.aadl:7:48
+    Unit_Designator Node_Id 1864
+    1864 unique property type identifier timing_properties.aadl:7:42
+     Identifier Node_Id 1863
+     1863 identifier timing_properties.aadl:7:48
       Corresponding_Entity Node_Id 0
       Display_Name Name_Id "Time_Units"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
-     Entity Node_Id 273
+     Entity Node_Id 275
      Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2210
-  2210 applies to timing_properties.aadl:107:02
+  Applies_To Node_Id 2212
+  2212 applies to timing_properties.aadl:107:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2206
-   2207 named element timing_properties.aadl:108:15
+   Owner_Categories List_Id 2208
+   2209 named element timing_properties.aadl:108:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2208 named element timing_properties.aadl:108:26
+   2210 named element timing_properties.aadl:108:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-2213 property set programming_properties.aadl:6:01
- Identifier Node_Id 2212
- 2212 identifier programming_properties.aadl:6:14
-  Corresponding_Entity Node_Id 2213
+2215 property set programming_properties.aadl:6:01
+ Identifier Node_Id 2214
+ 2214 identifier programming_properties.aadl:6:14
+  Corresponding_Entity Node_Id 2215
   Display_Name Name_Id "Programming_Properties"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 2214
- Declarations List_Id 2226
- 2223 property definition declaration programming_properties.aadl:7:02
-  Identifier Node_Id 2215
-  2215 identifier programming_properties.aadl:7:02
-   Corresponding_Entity Node_Id 2223
+ Entity_Scope Node_Id 2216
+ Declarations List_Id 2228
+ 2225 property definition declaration programming_properties.aadl:7:02
+  Identifier Node_Id 2217
+  2217 identifier programming_properties.aadl:7:02
+   Corresponding_Entity Node_Id 2225
    Display_Name Name_Id "Activate_Entrypoint"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2225
-  2225 property type programming_properties.aadl:7:02
+  Property_Name_Type Node_Id 2227
+  2227 property type programming_properties.aadl:7:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2218
-   2218 classifier type programming_properties.aadl:7:23
-    List_Items List_Id 2216
-    2217 classifier category ref programming_properties.aadl:7:35
+   Property_Type_Designator Node_Id 2220
+   2220 classifier type programming_properties.aadl:7:23
+    List_Items List_Id 2218
+    2219 classifier category ref programming_properties.aadl:7:35
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2218
-   2218 classifier type programming_properties.aadl:7:23
-    List_Items List_Id 2216
-    2217 classifier category ref programming_properties.aadl:7:35
+   Expanded_Type_Designator Node_Id 2220
+   2220 classifier type programming_properties.aadl:7:23
+    List_Items List_Id 2218
+    2219 classifier category ref programming_properties.aadl:7:35
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2224
-  2224 applies to programming_properties.aadl:7:02
+  Applies_To Node_Id 2226
+  2226 applies to programming_properties.aadl:7:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2220
-   2221 named element programming_properties.aadl:8:15
+   Owner_Categories List_Id 2222
+   2223 named element programming_properties.aadl:8:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2222 named element programming_properties.aadl:8:23
+   2224 named element programming_properties.aadl:8:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2235 property definition declaration programming_properties.aadl:10:02
-  Identifier Node_Id 2227
-  2227 identifier programming_properties.aadl:10:02
-   Corresponding_Entity Node_Id 2235
+ 2237 property definition declaration programming_properties.aadl:10:02
+  Identifier Node_Id 2229
+  2229 identifier programming_properties.aadl:10:02
+   Corresponding_Entity Node_Id 2237
    Display_Name Name_Id "Activate_Entrypoint_Call_Sequence"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2237
-  2237 property type programming_properties.aadl:10:02
+  Property_Name_Type Node_Id 2239
+  2239 property type programming_properties.aadl:10:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2230
-   2230 reference type programming_properties.aadl:10:37
-    List_Items List_Id 2228
-    2229 reference category programming_properties.aadl:10:48
+   Property_Type_Designator Node_Id 2232
+   2232 reference type programming_properties.aadl:10:37
+    List_Items List_Id 2230
+    2231 reference category programming_properties.aadl:10:48
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2230
-   2230 reference type programming_properties.aadl:10:37
-    List_Items List_Id 2228
-    2229 reference category programming_properties.aadl:10:48
+   Expanded_Type_Designator Node_Id 2232
+   2232 reference type programming_properties.aadl:10:37
+    List_Items List_Id 2230
+    2231 reference category programming_properties.aadl:10:48
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2236
-  2236 applies to programming_properties.aadl:10:02
+  Applies_To Node_Id 2238
+  2238 applies to programming_properties.aadl:10:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2232
-   2233 named element programming_properties.aadl:11:15
+   Owner_Categories List_Id 2234
+   2235 named element programming_properties.aadl:11:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2234 named element programming_properties.aadl:11:23
+   2236 named element programming_properties.aadl:11:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2244 property definition declaration programming_properties.aadl:13:02
-  Identifier Node_Id 2238
-  2238 identifier programming_properties.aadl:13:02
-   Corresponding_Entity Node_Id 2244
+ 2246 property definition declaration programming_properties.aadl:13:02
+  Identifier Node_Id 2240
+  2240 identifier programming_properties.aadl:13:02
+   Corresponding_Entity Node_Id 2246
    Display_Name Name_Id "Activate_Entrypoint_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2246
-  2246 property type programming_properties.aadl:13:02
+  Property_Name_Type Node_Id 2248
+  2248 property type programming_properties.aadl:13:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2239
-   2239 string type programming_properties.aadl:13:35
-   Expanded_Type_Designator Node_Id 2239
-   2239 string type programming_properties.aadl:13:35
+   Property_Type_Designator Node_Id 2241
+   2241 string type programming_properties.aadl:13:35
+   Expanded_Type_Designator Node_Id 2241
+   2241 string type programming_properties.aadl:13:35
   Default_Value Node_Id 0
-  Applies_To Node_Id 2245
-  2245 applies to programming_properties.aadl:13:02
+  Applies_To Node_Id 2247
+  2247 applies to programming_properties.aadl:13:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2241
-   2242 named element programming_properties.aadl:14:15
+   Owner_Categories List_Id 2243
+   2244 named element programming_properties.aadl:14:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2243 named element programming_properties.aadl:14:23
+   2245 named element programming_properties.aadl:14:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2258 property definition declaration programming_properties.aadl:16:02
-  Identifier Node_Id 2247
-  2247 identifier programming_properties.aadl:16:02
-   Corresponding_Entity Node_Id 2258
+ 2260 property definition declaration programming_properties.aadl:16:02
+  Identifier Node_Id 2249
+  2249 identifier programming_properties.aadl:16:02
+   Corresponding_Entity Node_Id 2260
    Display_Name Name_Id "Compute_Entrypoint"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2260
-  2260 property type programming_properties.aadl:16:02
+  Property_Name_Type Node_Id 2262
+  2262 property type programming_properties.aadl:16:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2250
-   2250 classifier type programming_properties.aadl:16:22
-    List_Items List_Id 2248
-    2249 classifier category ref programming_properties.aadl:16:34
+   Property_Type_Designator Node_Id 2252
+   2252 classifier type programming_properties.aadl:16:22
+    List_Items List_Id 2250
+    2251 classifier category ref programming_properties.aadl:16:34
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2250
-   2250 classifier type programming_properties.aadl:16:22
-    List_Items List_Id 2248
-    2249 classifier category ref programming_properties.aadl:16:34
+   Expanded_Type_Designator Node_Id 2252
+   2252 classifier type programming_properties.aadl:16:22
+    List_Items List_Id 2250
+    2251 classifier category ref programming_properties.aadl:16:34
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2259
-  2259 applies to programming_properties.aadl:16:02
+  Applies_To Node_Id 2261
+  2261 applies to programming_properties.aadl:16:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2252
-   2253 named element programming_properties.aadl:17:15
+   Owner_Categories List_Id 2254
+   2255 named element programming_properties.aadl:17:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2254 named element programming_properties.aadl:17:23
+   2256 named element programming_properties.aadl:17:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2255 named element programming_properties.aadl:17:31
+   2257 named element programming_properties.aadl:17:31
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2256 named element programming_properties.aadl:17:50
+   2258 named element programming_properties.aadl:17:50
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2257 named element programming_properties.aadl:17:62
+   2259 named element programming_properties.aadl:17:62
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 2272 property definition declaration programming_properties.aadl:19:02
-  Identifier Node_Id 2261
-  2261 identifier programming_properties.aadl:19:02
-   Corresponding_Entity Node_Id 2272
+ 2274 property definition declaration programming_properties.aadl:19:02
+  Identifier Node_Id 2263
+  2263 identifier programming_properties.aadl:19:02
+   Corresponding_Entity Node_Id 2274
    Display_Name Name_Id "Compute_Entrypoint_Call_Sequence"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2274
-  2274 property type programming_properties.aadl:19:02
+  Property_Name_Type Node_Id 2276
+  2276 property type programming_properties.aadl:19:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2264
-   2264 reference type programming_properties.aadl:19:36
-    List_Items List_Id 2262
-    2263 reference category programming_properties.aadl:19:47
+   Property_Type_Designator Node_Id 2266
+   2266 reference type programming_properties.aadl:19:36
+    List_Items List_Id 2264
+    2265 reference category programming_properties.aadl:19:47
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2264
-   2264 reference type programming_properties.aadl:19:36
-    List_Items List_Id 2262
-    2263 reference category programming_properties.aadl:19:47
+   Expanded_Type_Designator Node_Id 2266
+   2266 reference type programming_properties.aadl:19:36
+    List_Items List_Id 2264
+    2265 reference category programming_properties.aadl:19:47
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2273
-  2273 applies to programming_properties.aadl:19:02
+  Applies_To Node_Id 2275
+  2275 applies to programming_properties.aadl:19:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2266
-   2267 named element programming_properties.aadl:20:15
+   Owner_Categories List_Id 2268
+   2269 named element programming_properties.aadl:20:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2268 named element programming_properties.aadl:20:23
+   2270 named element programming_properties.aadl:20:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2269 named element programming_properties.aadl:20:31
+   2271 named element programming_properties.aadl:20:31
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2270 named element programming_properties.aadl:20:50
+   2272 named element programming_properties.aadl:20:50
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2271 named element programming_properties.aadl:20:62
+   2273 named element programming_properties.aadl:20:62
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 2284 property definition declaration programming_properties.aadl:22:02
-  Identifier Node_Id 2275
-  2275 identifier programming_properties.aadl:22:02
-   Corresponding_Entity Node_Id 2284
+ 2286 property definition declaration programming_properties.aadl:22:02
+  Identifier Node_Id 2277
+  2277 identifier programming_properties.aadl:22:02
+   Corresponding_Entity Node_Id 2286
    Display_Name Name_Id "Compute_Entrypoint_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2286
-  2286 property type programming_properties.aadl:22:02
+  Property_Name_Type Node_Id 2288
+  2288 property type programming_properties.aadl:22:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2276
-   2276 string type programming_properties.aadl:22:34
-   Expanded_Type_Designator Node_Id 2276
-   2276 string type programming_properties.aadl:22:34
+   Property_Type_Designator Node_Id 2278
+   2278 string type programming_properties.aadl:22:34
+   Expanded_Type_Designator Node_Id 2278
+   2278 string type programming_properties.aadl:22:34
   Default_Value Node_Id 0
-  Applies_To Node_Id 2285
-  2285 applies to programming_properties.aadl:22:02
+  Applies_To Node_Id 2287
+  2287 applies to programming_properties.aadl:22:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2278
-   2279 named element programming_properties.aadl:23:15
+   Owner_Categories List_Id 2280
+   2281 named element programming_properties.aadl:23:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2280 named element programming_properties.aadl:23:23
+   2282 named element programming_properties.aadl:23:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2281 named element programming_properties.aadl:23:31
+   2283 named element programming_properties.aadl:23:31
     Identifier Node_Id 0
     Category Byte 29
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2282 named element programming_properties.aadl:23:50
+   2284 named element programming_properties.aadl:23:50
     Identifier Node_Id 0
     Category Byte 15
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2283 named element programming_properties.aadl:23:62
+   2285 named element programming_properties.aadl:23:62
     Identifier Node_Id 0
     Category Byte 17
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 2295 property definition declaration programming_properties.aadl:25:02
-  Identifier Node_Id 2287
-  2287 identifier programming_properties.aadl:25:02
-   Corresponding_Entity Node_Id 2295
+ 2297 property definition declaration programming_properties.aadl:25:02
+  Identifier Node_Id 2289
+  2289 identifier programming_properties.aadl:25:02
+   Corresponding_Entity Node_Id 2297
    Display_Name Name_Id "Deactivate_Entrypoint"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2297
-  2297 property type programming_properties.aadl:25:02
+  Property_Name_Type Node_Id 2299
+  2299 property type programming_properties.aadl:25:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2290
-   2290 classifier type programming_properties.aadl:25:25
-    List_Items List_Id 2288
-    2289 classifier category ref programming_properties.aadl:25:37
+   Property_Type_Designator Node_Id 2292
+   2292 classifier type programming_properties.aadl:25:25
+    List_Items List_Id 2290
+    2291 classifier category ref programming_properties.aadl:25:37
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2290
-   2290 classifier type programming_properties.aadl:25:25
-    List_Items List_Id 2288
-    2289 classifier category ref programming_properties.aadl:25:37
+   Expanded_Type_Designator Node_Id 2292
+   2292 classifier type programming_properties.aadl:25:25
+    List_Items List_Id 2290
+    2291 classifier category ref programming_properties.aadl:25:37
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2296
-  2296 applies to programming_properties.aadl:25:02
+  Applies_To Node_Id 2298
+  2298 applies to programming_properties.aadl:25:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2292
-   2293 named element programming_properties.aadl:26:15
+   Owner_Categories List_Id 2294
+   2295 named element programming_properties.aadl:26:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2294 named element programming_properties.aadl:26:23
+   2296 named element programming_properties.aadl:26:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2306 property definition declaration programming_properties.aadl:28:02
-  Identifier Node_Id 2298
-  2298 identifier programming_properties.aadl:28:02
-   Corresponding_Entity Node_Id 2306
+ 2308 property definition declaration programming_properties.aadl:28:02
+  Identifier Node_Id 2300
+  2300 identifier programming_properties.aadl:28:02
+   Corresponding_Entity Node_Id 2308
    Display_Name Name_Id "Deactivate_Entrypoint_Call_Sequence"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2308
-  2308 property type programming_properties.aadl:28:02
+  Property_Name_Type Node_Id 2310
+  2310 property type programming_properties.aadl:28:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2301
-   2301 reference type programming_properties.aadl:28:39
-    List_Items List_Id 2299
-    2300 reference category programming_properties.aadl:28:50
+   Property_Type_Designator Node_Id 2303
+   2303 reference type programming_properties.aadl:28:39
+    List_Items List_Id 2301
+    2302 reference category programming_properties.aadl:28:50
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2301
-   2301 reference type programming_properties.aadl:28:39
-    List_Items List_Id 2299
-    2300 reference category programming_properties.aadl:28:50
+   Expanded_Type_Designator Node_Id 2303
+   2303 reference type programming_properties.aadl:28:39
+    List_Items List_Id 2301
+    2302 reference category programming_properties.aadl:28:50
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2307
-  2307 applies to programming_properties.aadl:28:02
+  Applies_To Node_Id 2309
+  2309 applies to programming_properties.aadl:28:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2303
-   2304 named element programming_properties.aadl:29:15
+   Owner_Categories List_Id 2305
+   2306 named element programming_properties.aadl:29:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2305 named element programming_properties.aadl:29:23
+   2307 named element programming_properties.aadl:29:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2314 property definition declaration programming_properties.aadl:31:02
-  Identifier Node_Id 2309
-  2309 identifier programming_properties.aadl:31:02
-   Corresponding_Entity Node_Id 2314
+ 2316 property definition declaration programming_properties.aadl:31:02
+  Identifier Node_Id 2311
+  2311 identifier programming_properties.aadl:31:02
+   Corresponding_Entity Node_Id 2316
    Display_Name Name_Id "Deactivate_Entrypoint_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2316
-  2316 property type programming_properties.aadl:31:02
+  Property_Name_Type Node_Id 2318
+  2318 property type programming_properties.aadl:31:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2310
-   2310 string type programming_properties.aadl:31:37
-   Expanded_Type_Designator Node_Id 2310
-   2310 string type programming_properties.aadl:31:37
+   Property_Type_Designator Node_Id 2312
+   2312 string type programming_properties.aadl:31:37
+   Expanded_Type_Designator Node_Id 2312
+   2312 string type programming_properties.aadl:31:37
   Default_Value Node_Id 0
-  Applies_To Node_Id 2315
-  2315 applies to programming_properties.aadl:31:02
+  Applies_To Node_Id 2317
+  2317 applies to programming_properties.aadl:31:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2312
-   2313 named element programming_properties.aadl:32:15
+   Owner_Categories List_Id 2314
+   2315 named element programming_properties.aadl:32:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
- 2325 property definition declaration programming_properties.aadl:34:02
-  Identifier Node_Id 2317
-  2317 identifier programming_properties.aadl:34:02
-   Corresponding_Entity Node_Id 2325
+ 2327 property definition declaration programming_properties.aadl:34:02
+  Identifier Node_Id 2319
+  2319 identifier programming_properties.aadl:34:02
+   Corresponding_Entity Node_Id 2327
    Display_Name Name_Id "Finalize_Entrypoint"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2327
-  2327 property type programming_properties.aadl:34:02
+  Property_Name_Type Node_Id 2329
+  2329 property type programming_properties.aadl:34:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2320
-   2320 classifier type programming_properties.aadl:34:23
-    List_Items List_Id 2318
-    2319 classifier category ref programming_properties.aadl:34:35
+   Property_Type_Designator Node_Id 2322
+   2322 classifier type programming_properties.aadl:34:23
+    List_Items List_Id 2320
+    2321 classifier category ref programming_properties.aadl:34:35
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2320
-   2320 classifier type programming_properties.aadl:34:23
-    List_Items List_Id 2318
-    2319 classifier category ref programming_properties.aadl:34:35
+   Expanded_Type_Designator Node_Id 2322
+   2322 classifier type programming_properties.aadl:34:23
+    List_Items List_Id 2320
+    2321 classifier category ref programming_properties.aadl:34:35
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2326
-  2326 applies to programming_properties.aadl:34:02
+  Applies_To Node_Id 2328
+  2328 applies to programming_properties.aadl:34:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2322
-   2323 named element programming_properties.aadl:35:15
+   Owner_Categories List_Id 2324
+   2325 named element programming_properties.aadl:35:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2324 named element programming_properties.aadl:35:23
+   2326 named element programming_properties.aadl:35:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2336 property definition declaration programming_properties.aadl:37:02
-  Identifier Node_Id 2328
-  2328 identifier programming_properties.aadl:37:02
-   Corresponding_Entity Node_Id 2336
+ 2338 property definition declaration programming_properties.aadl:37:02
+  Identifier Node_Id 2330
+  2330 identifier programming_properties.aadl:37:02
+   Corresponding_Entity Node_Id 2338
    Display_Name Name_Id "Finalize_Entrypoint_Call_Sequence"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2338
-  2338 property type programming_properties.aadl:37:02
+  Property_Name_Type Node_Id 2340
+  2340 property type programming_properties.aadl:37:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2331
-   2331 reference type programming_properties.aadl:37:37
-    List_Items List_Id 2329
-    2330 reference category programming_properties.aadl:37:48
+   Property_Type_Designator Node_Id 2333
+   2333 reference type programming_properties.aadl:37:37
+    List_Items List_Id 2331
+    2332 reference category programming_properties.aadl:37:48
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2331
-   2331 reference type programming_properties.aadl:37:37
-    List_Items List_Id 2329
-    2330 reference category programming_properties.aadl:37:48
+   Expanded_Type_Designator Node_Id 2333
+   2333 reference type programming_properties.aadl:37:37
+    List_Items List_Id 2331
+    2332 reference category programming_properties.aadl:37:48
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2337
-  2337 applies to programming_properties.aadl:37:02
+  Applies_To Node_Id 2339
+  2339 applies to programming_properties.aadl:37:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2333
-   2334 named element programming_properties.aadl:38:15
+   Owner_Categories List_Id 2335
+   2336 named element programming_properties.aadl:38:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2335 named element programming_properties.aadl:38:23
+   2337 named element programming_properties.aadl:38:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2345 property definition declaration programming_properties.aadl:40:02
-  Identifier Node_Id 2339
-  2339 identifier programming_properties.aadl:40:02
-   Corresponding_Entity Node_Id 2345
+ 2347 property definition declaration programming_properties.aadl:40:02
+  Identifier Node_Id 2341
+  2341 identifier programming_properties.aadl:40:02
+   Corresponding_Entity Node_Id 2347
    Display_Name Name_Id "Finalize_Entrypoint_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2347
-  2347 property type programming_properties.aadl:40:02
+  Property_Name_Type Node_Id 2349
+  2349 property type programming_properties.aadl:40:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2340
-   2340 string type programming_properties.aadl:40:35
-   Expanded_Type_Designator Node_Id 2340
-   2340 string type programming_properties.aadl:40:35
+   Property_Type_Designator Node_Id 2342
+   2342 string type programming_properties.aadl:40:35
+   Expanded_Type_Designator Node_Id 2342
+   2342 string type programming_properties.aadl:40:35
   Default_Value Node_Id 0
-  Applies_To Node_Id 2346
-  2346 applies to programming_properties.aadl:40:02
+  Applies_To Node_Id 2348
+  2348 applies to programming_properties.aadl:40:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2342
-   2343 named element programming_properties.aadl:41:15
+   Owner_Categories List_Id 2344
+   2345 named element programming_properties.aadl:41:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2344 named element programming_properties.aadl:41:23
+   2346 named element programming_properties.aadl:41:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2356 property definition declaration programming_properties.aadl:43:02
-  Identifier Node_Id 2348
-  2348 identifier programming_properties.aadl:43:02
-   Corresponding_Entity Node_Id 2356
+ 2358 property definition declaration programming_properties.aadl:43:02
+  Identifier Node_Id 2350
+  2350 identifier programming_properties.aadl:43:02
+   Corresponding_Entity Node_Id 2358
    Display_Name Name_Id "Initialize_Entrypoint"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2358
-  2358 property type programming_properties.aadl:43:02
+  Property_Name_Type Node_Id 2360
+  2360 property type programming_properties.aadl:43:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2351
-   2351 classifier type programming_properties.aadl:43:25
-    List_Items List_Id 2349
-    2350 classifier category ref programming_properties.aadl:43:37
+   Property_Type_Designator Node_Id 2353
+   2353 classifier type programming_properties.aadl:43:25
+    List_Items List_Id 2351
+    2352 classifier category ref programming_properties.aadl:43:37
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2351
-   2351 classifier type programming_properties.aadl:43:25
-    List_Items List_Id 2349
-    2350 classifier category ref programming_properties.aadl:43:37
+   Expanded_Type_Designator Node_Id 2353
+   2353 classifier type programming_properties.aadl:43:25
+    List_Items List_Id 2351
+    2352 classifier category ref programming_properties.aadl:43:37
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2357
-  2357 applies to programming_properties.aadl:43:02
+  Applies_To Node_Id 2359
+  2359 applies to programming_properties.aadl:43:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2353
-   2354 named element programming_properties.aadl:44:15
+   Owner_Categories List_Id 2355
+   2356 named element programming_properties.aadl:44:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2355 named element programming_properties.aadl:44:23
+   2357 named element programming_properties.aadl:44:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2367 property definition declaration programming_properties.aadl:46:02
-  Identifier Node_Id 2359
-  2359 identifier programming_properties.aadl:46:02
-   Corresponding_Entity Node_Id 2367
+ 2369 property definition declaration programming_properties.aadl:46:02
+  Identifier Node_Id 2361
+  2361 identifier programming_properties.aadl:46:02
+   Corresponding_Entity Node_Id 2369
    Display_Name Name_Id "Initialize_Entrypoint_Call_Sequence"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2369
-  2369 property type programming_properties.aadl:46:02
+  Property_Name_Type Node_Id 2371
+  2371 property type programming_properties.aadl:46:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2362
-   2362 reference type programming_properties.aadl:46:39
-    List_Items List_Id 2360
-    2361 reference category programming_properties.aadl:46:50
+   Property_Type_Designator Node_Id 2364
+   2364 reference type programming_properties.aadl:46:39
+    List_Items List_Id 2362
+    2363 reference category programming_properties.aadl:46:50
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2362
-   2362 reference type programming_properties.aadl:46:39
-    List_Items List_Id 2360
-    2361 reference category programming_properties.aadl:46:50
+   Expanded_Type_Designator Node_Id 2364
+   2364 reference type programming_properties.aadl:46:39
+    List_Items List_Id 2362
+    2363 reference category programming_properties.aadl:46:50
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2368
-  2368 applies to programming_properties.aadl:46:02
+  Applies_To Node_Id 2370
+  2370 applies to programming_properties.aadl:46:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2364
-   2365 named element programming_properties.aadl:47:15
+   Owner_Categories List_Id 2366
+   2367 named element programming_properties.aadl:47:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2366 named element programming_properties.aadl:47:23
+   2368 named element programming_properties.aadl:47:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2376 property definition declaration programming_properties.aadl:49:02
-  Identifier Node_Id 2370
-  2370 identifier programming_properties.aadl:49:02
-   Corresponding_Entity Node_Id 2376
+ 2378 property definition declaration programming_properties.aadl:49:02
+  Identifier Node_Id 2372
+  2372 identifier programming_properties.aadl:49:02
+   Corresponding_Entity Node_Id 2378
    Display_Name Name_Id "Initialize_Entrypoint_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2378
-  2378 property type programming_properties.aadl:49:02
+  Property_Name_Type Node_Id 2380
+  2380 property type programming_properties.aadl:49:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2371
-   2371 string type programming_properties.aadl:49:37
-   Expanded_Type_Designator Node_Id 2371
-   2371 string type programming_properties.aadl:49:37
+   Property_Type_Designator Node_Id 2373
+   2373 string type programming_properties.aadl:49:37
+   Expanded_Type_Designator Node_Id 2373
+   2373 string type programming_properties.aadl:49:37
   Default_Value Node_Id 0
-  Applies_To Node_Id 2377
-  2377 applies to programming_properties.aadl:49:02
+  Applies_To Node_Id 2379
+  2379 applies to programming_properties.aadl:49:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2373
-   2374 named element programming_properties.aadl:50:15
+   Owner_Categories List_Id 2375
+   2376 named element programming_properties.aadl:50:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2375 named element programming_properties.aadl:50:23
+   2377 named element programming_properties.aadl:50:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2387 property definition declaration programming_properties.aadl:52:02
-  Identifier Node_Id 2379
-  2379 identifier programming_properties.aadl:52:02
-   Corresponding_Entity Node_Id 2387
+ 2389 property definition declaration programming_properties.aadl:52:02
+  Identifier Node_Id 2381
+  2381 identifier programming_properties.aadl:52:02
+   Corresponding_Entity Node_Id 2389
    Display_Name Name_Id "Recover_Entrypoint"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2389
-  2389 property type programming_properties.aadl:52:02
+  Property_Name_Type Node_Id 2391
+  2391 property type programming_properties.aadl:52:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2382
-   2382 classifier type programming_properties.aadl:52:22
-    List_Items List_Id 2380
-    2381 classifier category ref programming_properties.aadl:52:34
+   Property_Type_Designator Node_Id 2384
+   2384 classifier type programming_properties.aadl:52:22
+    List_Items List_Id 2382
+    2383 classifier category ref programming_properties.aadl:52:34
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2382
-   2382 classifier type programming_properties.aadl:52:22
-    List_Items List_Id 2380
-    2381 classifier category ref programming_properties.aadl:52:34
+   Expanded_Type_Designator Node_Id 2384
+   2384 classifier type programming_properties.aadl:52:22
+    List_Items List_Id 2382
+    2383 classifier category ref programming_properties.aadl:52:34
      Identifier Node_Id 0
      Category Byte 25
      Component_Cat Byte 2
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2388
-  2388 applies to programming_properties.aadl:52:02
+  Applies_To Node_Id 2390
+  2390 applies to programming_properties.aadl:52:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2384
-   2385 named element programming_properties.aadl:53:15
+   Owner_Categories List_Id 2386
+   2387 named element programming_properties.aadl:53:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2386 named element programming_properties.aadl:53:23
+   2388 named element programming_properties.aadl:53:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2398 property definition declaration programming_properties.aadl:55:02
-  Identifier Node_Id 2390
-  2390 identifier programming_properties.aadl:55:02
-   Corresponding_Entity Node_Id 2398
+ 2400 property definition declaration programming_properties.aadl:55:02
+  Identifier Node_Id 2392
+  2392 identifier programming_properties.aadl:55:02
+   Corresponding_Entity Node_Id 2400
    Display_Name Name_Id "Recover_Entrypoint_Call_Sequence"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2400
-  2400 property type programming_properties.aadl:55:02
+  Property_Name_Type Node_Id 2402
+  2402 property type programming_properties.aadl:55:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2393
-   2393 reference type programming_properties.aadl:55:36
-    List_Items List_Id 2391
-    2392 reference category programming_properties.aadl:55:47
+   Property_Type_Designator Node_Id 2395
+   2395 reference type programming_properties.aadl:55:36
+    List_Items List_Id 2393
+    2394 reference category programming_properties.aadl:55:47
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2393
-   2393 reference type programming_properties.aadl:55:36
-    List_Items List_Id 2391
-    2392 reference category programming_properties.aadl:55:47
+   Expanded_Type_Designator Node_Id 2395
+   2395 reference type programming_properties.aadl:55:36
+    List_Items List_Id 2393
+    2394 reference category programming_properties.aadl:55:47
      Identifier Node_Id 0
      Category Byte 56
      Component_Cat Byte 14
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2399
-  2399 applies to programming_properties.aadl:55:02
+  Applies_To Node_Id 2401
+  2401 applies to programming_properties.aadl:55:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2395
-   2396 named element programming_properties.aadl:56:15
+   Owner_Categories List_Id 2397
+   2398 named element programming_properties.aadl:56:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2397 named element programming_properties.aadl:56:23
+   2399 named element programming_properties.aadl:56:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2407 property definition declaration programming_properties.aadl:58:02
-  Identifier Node_Id 2401
-  2401 identifier programming_properties.aadl:58:02
-   Corresponding_Entity Node_Id 2407
+ 2409 property definition declaration programming_properties.aadl:58:02
+  Identifier Node_Id 2403
+  2403 identifier programming_properties.aadl:58:02
+   Corresponding_Entity Node_Id 2409
    Display_Name Name_Id "Recover_Entrypoint_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2409
-  2409 property type programming_properties.aadl:58:02
+  Property_Name_Type Node_Id 2411
+  2411 property type programming_properties.aadl:58:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2402
-   2402 string type programming_properties.aadl:58:34
-   Expanded_Type_Designator Node_Id 2402
-   2402 string type programming_properties.aadl:58:34
+   Property_Type_Designator Node_Id 2404
+   2404 string type programming_properties.aadl:58:34
+   Expanded_Type_Designator Node_Id 2404
+   2404 string type programming_properties.aadl:58:34
   Default_Value Node_Id 0
-  Applies_To Node_Id 2408
-  2408 applies to programming_properties.aadl:58:02
+  Applies_To Node_Id 2410
+  2410 applies to programming_properties.aadl:58:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2404
-   2405 named element programming_properties.aadl:59:15
+   Owner_Categories List_Id 2406
+   2407 named element programming_properties.aadl:59:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2406 named element programming_properties.aadl:59:23
+   2408 named element programming_properties.aadl:59:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2426 property definition declaration programming_properties.aadl:61:02
-  Identifier Node_Id 2410
-  2410 identifier programming_properties.aadl:61:02
-   Corresponding_Entity Node_Id 2426
+ 2428 property definition declaration programming_properties.aadl:61:02
+  Identifier Node_Id 2412
+  2412 identifier programming_properties.aadl:61:02
+   Corresponding_Entity Node_Id 2428
    Display_Name Name_Id "Source_Language"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2428
-  2428 property type programming_properties.aadl:61:02
+  Property_Name_Type Node_Id 2430
+  2430 property type programming_properties.aadl:61:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 2413
-   2413 unique property type identifier programming_properties.aadl:61:32
-    Identifier Node_Id 2412
-    2412 identifier programming_properties.aadl:61:35
+   Property_Type_Designator Node_Id 2415
+   2415 unique property type identifier programming_properties.aadl:61:32
+    Identifier Node_Id 2414
+    2414 identifier programming_properties.aadl:61:35
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Source_Languages"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 122
+    Entity Node_Id 124
     Property_Set_Identifier Node_Id 0
    Expanded_Type_Designator Node_Id 94
    94 enumeration type aadl_project.aadl:55:36
@@ -13274,238 +13284,248 @@ Declarations List_Id 7
      Display_Name Name_Id "ACN"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
+    122 identifier aadl_project.aadl:82:06
+     Corresponding_Entity Node_Id 94
+     Display_Name Name_Id "QGenC"
+     Scope_Entity Node_Id 0
+     Backend_Node Node_Id 0
+    123 identifier aadl_project.aadl:83:06
+     Corresponding_Entity Node_Id 94
+     Display_Name Name_Id "QGenAda"
+     Scope_Entity Node_Id 0
+     Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2427
-  2427 applies to programming_properties.aadl:61:02
+  Applies_To Node_Id 2429
+  2429 applies to programming_properties.aadl:61:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2414
-   2415 named element programming_properties.aadl:62:15
+   Owner_Categories List_Id 2416
+   2417 named element programming_properties.aadl:62:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2416 named element programming_properties.aadl:62:27
+   2418 named element programming_properties.aadl:62:27
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   2417 named element programming_properties.aadl:62:33
+   2419 named element programming_properties.aadl:62:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2418 named element programming_properties.aadl:62:41
+   2420 named element programming_properties.aadl:62:41
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   2419 named element programming_properties.aadl:62:55
+   2421 named element programming_properties.aadl:62:55
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2420 named element programming_properties.aadl:62:64
+   2422 named element programming_properties.aadl:62:64
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   2421 named element programming_properties.aadl:62:72
+   2423 named element programming_properties.aadl:62:72
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   2422 named element programming_properties.aadl:62:77
+   2424 named element programming_properties.aadl:62:77
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2423 named element programming_properties.aadl:63:03
+   2425 named element programming_properties.aadl:63:03
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2424 named element programming_properties.aadl:63:14
+   2426 named element programming_properties.aadl:63:14
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   2425 named element programming_properties.aadl:63:33
+   2427 named element programming_properties.aadl:63:33
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
- 2439 property definition declaration programming_properties.aadl:65:02
-  Identifier Node_Id 2429
-  2429 identifier programming_properties.aadl:65:02
-   Corresponding_Entity Node_Id 2439
+ 2441 property definition declaration programming_properties.aadl:65:02
+  Identifier Node_Id 2431
+  2431 identifier programming_properties.aadl:65:02
+   Corresponding_Entity Node_Id 2441
    Display_Name Name_Id "Source_Name"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2441
-  2441 property type programming_properties.aadl:65:02
+  Property_Name_Type Node_Id 2443
+  2443 property type programming_properties.aadl:65:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2430
-   2430 string type programming_properties.aadl:65:15
-   Expanded_Type_Designator Node_Id 2430
-   2430 string type programming_properties.aadl:65:15
+   Property_Type_Designator Node_Id 2432
+   2432 string type programming_properties.aadl:65:15
+   Expanded_Type_Designator Node_Id 2432
+   2432 string type programming_properties.aadl:65:15
   Default_Value Node_Id 0
-  Applies_To Node_Id 2440
-  2440 applies to programming_properties.aadl:65:02
+  Applies_To Node_Id 2442
+  2442 applies to programming_properties.aadl:65:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2432
-   2433 named element programming_properties.aadl:66:15
+   Owner_Categories List_Id 2434
+   2435 named element programming_properties.aadl:66:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   2434 named element programming_properties.aadl:66:21
+   2436 named element programming_properties.aadl:66:21
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2435 named element programming_properties.aadl:66:27
+   2437 named element programming_properties.aadl:66:27
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2436 named element programming_properties.aadl:66:39
+   2438 named element programming_properties.aadl:66:39
     Identifier Node_Id 0
     Category Byte 3
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2437 named element programming_properties.aadl:66:50
+   2439 named element programming_properties.aadl:66:50
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   2438 named element programming_properties.aadl:66:63
+   2440 named element programming_properties.aadl:66:63
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
- 2461 property definition declaration programming_properties.aadl:68:02
-  Identifier Node_Id 2442
-  2442 identifier programming_properties.aadl:68:02
-   Corresponding_Entity Node_Id 2461
+ 2463 property definition declaration programming_properties.aadl:68:02
+  Identifier Node_Id 2444
+  2444 identifier programming_properties.aadl:68:02
+   Corresponding_Entity Node_Id 2463
    Display_Name Name_Id "Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2463
-  2463 property type programming_properties.aadl:68:02
+  Property_Name_Type Node_Id 2465
+  2465 property type programming_properties.aadl:68:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 2444
-   2444 string type programming_properties.aadl:68:31
-   Expanded_Type_Designator Node_Id 2444
-   2444 string type programming_properties.aadl:68:31
+   Property_Type_Designator Node_Id 2446
+   2446 string type programming_properties.aadl:68:31
+   Expanded_Type_Designator Node_Id 2446
+   2446 string type programming_properties.aadl:68:31
   Default_Value Node_Id 0
-  Applies_To Node_Id 2462
-  2462 applies to programming_properties.aadl:68:02
+  Applies_To Node_Id 2464
+  2464 applies to programming_properties.aadl:68:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2445
-   2446 named element programming_properties.aadl:68:54
+   Owner_Categories List_Id 2447
+   2448 named element programming_properties.aadl:68:54
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   2447 named element programming_properties.aadl:69:03
+   2449 named element programming_properties.aadl:69:03
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2448 named element programming_properties.aadl:69:09
+   2450 named element programming_properties.aadl:69:09
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2449 named element programming_properties.aadl:69:21
+   2451 named element programming_properties.aadl:69:21
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 4
     Classifier_Ref Node_Id 0
-   2450 named element programming_properties.aadl:69:29
+   2452 named element programming_properties.aadl:69:29
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 5
     Classifier_Ref Node_Id 0
-   2451 named element programming_properties.aadl:69:43
+   2453 named element programming_properties.aadl:69:43
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 6
     Classifier_Ref Node_Id 0
-   2452 named element programming_properties.aadl:70:03
+   2454 named element programming_properties.aadl:70:03
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
-   2453 named element programming_properties.aadl:70:11
+   2455 named element programming_properties.aadl:70:11
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
-   2454 named element programming_properties.aadl:70:24
+   2456 named element programming_properties.aadl:70:24
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   2455 named element programming_properties.aadl:70:43
+   2457 named element programming_properties.aadl:70:43
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   2456 named element programming_properties.aadl:70:51
+   2458 named element programming_properties.aadl:70:51
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   2457 named element programming_properties.aadl:71:03
+   2459 named element programming_properties.aadl:71:03
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2458 named element programming_properties.aadl:71:11
+   2460 named element programming_properties.aadl:71:11
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2459 named element programming_properties.aadl:71:22
+   2461 named element programming_properties.aadl:71:22
     Identifier Node_Id 0
     Category Byte 3
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2460 named element programming_properties.aadl:71:33
+   2462 named element programming_properties.aadl:71:33
     Identifier Node_Id 0
     Category Byte 33
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 2472 property definition declaration programming_properties.aadl:75:02
-  Identifier Node_Id 2464
-  2464 identifier programming_properties.aadl:75:02
-   Corresponding_Entity Node_Id 2472
+ 2474 property definition declaration programming_properties.aadl:75:02
+  Identifier Node_Id 2466
+  2466 identifier programming_properties.aadl:75:02
+   Corresponding_Entity Node_Id 2474
    Display_Name Name_Id "Supported_Source_Language"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2474
-  2474 property type programming_properties.aadl:75:02
+  Property_Name_Type Node_Id 2476
+  2476 property type programming_properties.aadl:75:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 2467
-   2467 unique property type identifier programming_properties.aadl:75:34
-    Identifier Node_Id 2466
-    2466 identifier programming_properties.aadl:75:37
+   Property_Type_Designator Node_Id 2469
+   2469 unique property type identifier programming_properties.aadl:75:34
+    Identifier Node_Id 2468
+    2468 identifier programming_properties.aadl:75:37
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Source_Languages"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
-    Entity Node_Id 122
+    Entity Node_Id 124
     Property_Set_Identifier Node_Id 0
    Expanded_Type_Designator Node_Id 94
    94 enumeration type aadl_project.aadl:55:36
@@ -13640,133 +13660,143 @@ Declarations List_Id 7
      Display_Name Name_Id "ACN"
      Scope_Entity Node_Id 0
      Backend_Node Node_Id 0
+    122 identifier aadl_project.aadl:82:06
+     Corresponding_Entity Node_Id 94
+     Display_Name Name_Id "QGenC"
+     Scope_Entity Node_Id 0
+     Backend_Node Node_Id 0
+    123 identifier aadl_project.aadl:83:06
+     Corresponding_Entity Node_Id 94
+     Display_Name Name_Id "QGenAda"
+     Scope_Entity Node_Id 0
+     Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2473
-  2473 applies to programming_properties.aadl:75:02
+  Applies_To Node_Id 2475
+  2475 applies to programming_properties.aadl:75:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2468
-   2469 named element programming_properties.aadl:76:15
+   Owner_Categories List_Id 2470
+   2471 named element programming_properties.aadl:76:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2470 named element programming_properties.aadl:76:26
+   2472 named element programming_properties.aadl:76:26
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 9
     Classifier_Ref Node_Id 0
-   2471 named element programming_properties.aadl:76:45
+   2473 named element programming_properties.aadl:76:45
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2483 property definition declaration programming_properties.aadl:78:02
-  Identifier Node_Id 2475
-  2475 identifier programming_properties.aadl:78:02
-   Corresponding_Entity Node_Id 2483
+ 2485 property definition declaration programming_properties.aadl:78:02
+  Identifier Node_Id 2477
+  2477 identifier programming_properties.aadl:78:02
+   Corresponding_Entity Node_Id 2485
    Display_Name Name_Id "Type_Source_Name"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2485
-  2485 property type programming_properties.aadl:78:02
+  Property_Name_Type Node_Id 2487
+  2487 property type programming_properties.aadl:78:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2476
-   2476 string type programming_properties.aadl:78:20
-   Expanded_Type_Designator Node_Id 2476
-   2476 string type programming_properties.aadl:78:20
+   Property_Type_Designator Node_Id 2478
+   2478 string type programming_properties.aadl:78:20
+   Expanded_Type_Designator Node_Id 2478
+   2478 string type programming_properties.aadl:78:20
   Default_Value Node_Id 0
-  Applies_To Node_Id 2484
-  2484 applies to programming_properties.aadl:78:02
+  Applies_To Node_Id 2486
+  2486 applies to programming_properties.aadl:78:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2478
-   2479 named element programming_properties.aadl:79:15
+   Owner_Categories List_Id 2480
+   2481 named element programming_properties.aadl:79:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 1
     Classifier_Ref Node_Id 0
-   2480 named element programming_properties.aadl:79:21
+   2482 named element programming_properties.aadl:79:21
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
-   2481 named element programming_properties.aadl:79:27
+   2483 named element programming_properties.aadl:79:27
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 2
     Classifier_Ref Node_Id 0
-   2482 named element programming_properties.aadl:79:39
+   2484 named element programming_properties.aadl:79:39
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
- 2495 property definition declaration programming_properties.aadl:81:02
-  Identifier Node_Id 2486
-  2486 identifier programming_properties.aadl:81:02
-   Corresponding_Entity Node_Id 2495
+ 2497 property definition declaration programming_properties.aadl:81:02
+  Identifier Node_Id 2488
+  2488 identifier programming_properties.aadl:81:02
+   Corresponding_Entity Node_Id 2497
    Display_Name Name_Id "Hardware_Description_Source_Text"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean TRUE
-  Property_Name_Type Node_Id 2497
-  2497 property type programming_properties.aadl:81:02
+  Property_Name_Type Node_Id 2499
+  2499 property type programming_properties.aadl:81:02
    Is_List Boolean TRUE
    Multiplicity Int 1
-   Property_Type_Designator Node_Id 2488
-   2488 string type programming_properties.aadl:81:52
-   Expanded_Type_Designator Node_Id 2488
-   2488 string type programming_properties.aadl:81:52
+   Property_Type_Designator Node_Id 2490
+   2490 string type programming_properties.aadl:81:52
+   Expanded_Type_Designator Node_Id 2490
+   2490 string type programming_properties.aadl:81:52
   Default_Value Node_Id 0
-  Applies_To Node_Id 2496
-  2496 applies to programming_properties.aadl:81:02
+  Applies_To Node_Id 2498
+  2498 applies to programming_properties.aadl:81:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2489
-   2490 named element programming_properties.aadl:82:15
+   Owner_Categories List_Id 2491
+   2492 named element programming_properties.aadl:82:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   2491 named element programming_properties.aadl:82:23
+   2493 named element programming_properties.aadl:82:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   2492 named element programming_properties.aadl:82:28
+   2494 named element programming_properties.aadl:82:28
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2493 named element programming_properties.aadl:82:36
+   2495 named element programming_properties.aadl:82:36
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2494 named element programming_properties.aadl:82:47
+   2496 named element programming_properties.aadl:82:47
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2508 property definition declaration programming_properties.aadl:84:02
-  Identifier Node_Id 2498
-  2498 identifier programming_properties.aadl:84:02
-   Corresponding_Entity Node_Id 2508
+ 2510 property definition declaration programming_properties.aadl:84:02
+  Identifier Node_Id 2500
+  2500 identifier programming_properties.aadl:84:02
+   Corresponding_Entity Node_Id 2510
    Display_Name Name_Id "Hardware_Source_Language"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2510
-  2510 property type programming_properties.aadl:84:02
+  Property_Name_Type Node_Id 2512
+  2512 property type programming_properties.aadl:84:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2500
-   2500 unique property type identifier programming_properties.aadl:84:26
-    Identifier Node_Id 2499
-    2499 identifier programming_properties.aadl:84:28
+   Property_Type_Designator Node_Id 2502
+   2502 unique property type identifier programming_properties.aadl:84:26
+    Identifier Node_Id 2501
+    2501 identifier programming_properties.aadl:84:28
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Supported_Hardware_Source_Languages"
      Scope_Entity Node_Id 0
@@ -13783,98 +13813,98 @@ Declarations List_Id 7
      Backend_Node Node_Id 0
     Enumeration_Context Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2509
-  2509 applies to programming_properties.aadl:84:02
+  Applies_To Node_Id 2511
+  2511 applies to programming_properties.aadl:84:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2502
-   2503 named element programming_properties.aadl:85:15
+   Owner_Categories List_Id 2504
+   2505 named element programming_properties.aadl:85:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 7
     Classifier_Ref Node_Id 0
-   2504 named element programming_properties.aadl:85:23
+   2506 named element programming_properties.aadl:85:23
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 10
     Classifier_Ref Node_Id 0
-   2505 named element programming_properties.aadl:85:28
+   2507 named element programming_properties.aadl:85:28
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
-   2506 named element programming_properties.aadl:85:36
+   2508 named element programming_properties.aadl:85:36
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 8
     Classifier_Ref Node_Id 0
-   2507 named element programming_properties.aadl:85:47
+   2509 named element programming_properties.aadl:85:47
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 13
     Classifier_Ref Node_Id 0
- 2518 property definition declaration programming_properties.aadl:87:02
-  Identifier Node_Id 2511
-  2511 identifier programming_properties.aadl:87:02
-   Corresponding_Entity Node_Id 2518
+ 2520 property definition declaration programming_properties.aadl:87:02
+  Identifier Node_Id 2513
+  2513 identifier programming_properties.aadl:87:02
+   Corresponding_Entity Node_Id 2520
    Display_Name Name_Id "Device_Driver"
-   Scope_Entity Node_Id 2214
+   Scope_Entity Node_Id 2216
    Backend_Node Node_Id 0
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
-  Property_Name_Type Node_Id 2520
-  2520 property type programming_properties.aadl:87:02
+  Property_Name_Type Node_Id 2522
+  2522 property type programming_properties.aadl:87:02
    Is_List Boolean FALSE
    Multiplicity Int 0
-   Property_Type_Designator Node_Id 2514
-   2514 classifier type programming_properties.aadl:87:17
-    List_Items List_Id 2512
-    2513 classifier category ref programming_properties.aadl:87:29
+   Property_Type_Designator Node_Id 2516
+   2516 classifier type programming_properties.aadl:87:17
+    List_Items List_Id 2514
+    2515 classifier category ref programming_properties.aadl:87:29
      Identifier Node_Id 0
      Category Byte 24
      Component_Cat Byte 0
      Classifier_Ref Node_Id 0
-   Expanded_Type_Designator Node_Id 2514
-   2514 classifier type programming_properties.aadl:87:17
-    List_Items List_Id 2512
-    2513 classifier category ref programming_properties.aadl:87:29
+   Expanded_Type_Designator Node_Id 2516
+   2516 classifier type programming_properties.aadl:87:17
+    List_Items List_Id 2514
+    2515 classifier category ref programming_properties.aadl:87:29
      Identifier Node_Id 0
      Category Byte 24
      Component_Cat Byte 0
      Classifier_Ref Node_Id 0
   Default_Value Node_Id 0
-  Applies_To Node_Id 2519
-  2519 applies to programming_properties.aadl:87:02
+  Applies_To Node_Id 2521
+  2521 applies to programming_properties.aadl:87:02
    Is_All Boolean FALSE
-   Owner_Categories List_Id 2516
-   2517 named element programming_properties.aadl:88:15
+   Owner_Categories List_Id 2518
+   2519 named element programming_properties.aadl:88:15
     Identifier Node_Id 0
     Category Byte 11
     Component_Cat Byte 12
     Classifier_Ref Node_Id 0
  Property_Set_Context Node_Id 0
  Imports_List List_Id 0
-2524 package specification test.aadl:1:09
- Identifier Node_Id 2527
- 2527 identifier test.aadl:1:09
-  Corresponding_Entity Node_Id 2524
+2526 package specification test.aadl:1:09
+ Identifier Node_Id 2529
+ 2529 identifier test.aadl:1:09
+  Corresponding_Entity Node_Id 2526
   Display_Name Name_Id "t"
   Scope_Entity Node_Id 2
   Backend_Node Node_Id 0
- Entity_Scope Node_Id 2525
- Property_Scope Node_Id 2526
- Declarations List_Id 2532
- 2529 component type test.aadl:3:01
-  Identifier Node_Id 2528
-  2528 identifier test.aadl:3:08
-   Corresponding_Entity Node_Id 2529
+ Entity_Scope Node_Id 2527
+ Property_Scope Node_Id 2528
+ Declarations List_Id 2534
+ 2531 component type test.aadl:3:01
+  Identifier Node_Id 2530
+  2530 identifier test.aadl:3:08
+   Corresponding_Entity Node_Id 2531
    Display_Name Name_Id "s"
    Scope_Entity Node_Id 0
    Backend_Node Node_Id 0
-  Entity_Scope Node_Id 2530
-  Property_Scope Node_Id 2531
+  Entity_Scope Node_Id 2532
+  Property_Scope Node_Id 2533
   Is_Private Boolean FALSE
   First_Visited_Node Node_Id 0
-  Namespace Node_Id 2524
+  Namespace Node_Id 2526
   Default_Instance Node_Id 0
   Properties List_Id 0
   Parent Node_Id 0
@@ -13886,18 +13916,18 @@ Declarations List_Id 7
   Modes List_Id 0
   Prototypes List_Id 0
   Prototype_Bindings List_Id 0
- 2537 component implementation test.aadl:6:01
-  Identifier Node_Id 2534
-  2534 identifier test.aadl:6:25
-   Corresponding_Entity Node_Id 2537
+ 2539 component implementation test.aadl:6:01
+  Identifier Node_Id 2536
+  2536 identifier test.aadl:6:25
+   Corresponding_Entity Node_Id 2539
    Display_Name Name_Id "s.i"
    Scope_Entity Node_Id 0
    Backend_Node Node_Id 0
-  Entity_Scope Node_Id 2535
-  Property_Scope Node_Id 2536
+  Entity_Scope Node_Id 2537
+  Property_Scope Node_Id 2538
   Is_Private Boolean FALSE
   First_Visited_Node Node_Id 0
-  Namespace Node_Id 2524
+  Namespace Node_Id 2526
   Default_Instance Node_Id 0
   Properties List_Id 0
   Parent Node_Id 0
@@ -13908,9 +13938,9 @@ Declarations List_Id 7
   Modes List_Id 0
   Prototypes List_Id 0
   Prototype_Bindings List_Id 0
-  Component_Type_Identifier Node_Id 2533
-  2533 identifier test.aadl:6:23
-   Corresponding_Entity Node_Id 2529
+  Component_Type_Identifier Node_Id 2535
+  2535 identifier test.aadl:6:23
+   Corresponding_Entity Node_Id 2531
    Display_Name Name_Id "s"
    Scope_Entity Node_Id 0
    Backend_Node Node_Id 0
@@ -13921,10 +13951,10 @@ Declarations List_Id 7
  Has_Private_Part Boolean FALSE
  Has_Public_Part Boolean TRUE
  Properties List_Id 0
- Package_Name Node_Id 2523
- 2523 package name test.aadl:1:01
-  Identifiers List_Id 2521
-  2522 identifier test.aadl:1:09
+ Package_Name Node_Id 2525
+ 2525 package name test.aadl:1:01
+  Identifiers List_Id 2523
+  2524 identifier test.aadl:1:09
    Corresponding_Entity Node_Id 0
    Display_Name Name_Id "t"
    Scope_Entity Node_Id 0