From 503e9e64d6c5fe4e21418ba4bb14b3490fe7e6a3 Mon Sep 17 00:00:00 2001
From: niemisto <niemisto@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 25 Aug 2011 07:25:46 +0000
Subject: [PATCH] renamed L0.list -> L0.orderedSet

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@21907 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ontology/graph.tg        | Bin 65616 -> 65622 bytes
 .../graph/Sysdyn.pgraph                       |  12 +-
 .../graph/WorkModel.pgraph                    |  60 +-
 org.simantics.sysdyn.ontology/mdl2pgraph.pl   |   8 +-
 .../testGraph/Cancer.pgraph.keep              | 552 +++++++++---------
 5 files changed, 316 insertions(+), 316 deletions(-)

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 2b7004cfb95ddefe5427005a6dbdbcd7b78a6649..a13b217de363712bcac538e608a6aa34cf1da7a7 100644
GIT binary patch
delta 58
zcmcc6z;dmDWy57YA%-$W1_lNuuKc2u)S}ds;M9`I7x~I2NAceh2m;G+dL$OR<mV=4
L=54kY5c~iDCj=6S

delta 51
zcmccCz;dC1Wy58@$<O&p1cDeD7#Ns1Jravu@^ce2^Cm~|-{md?3$o;77ME;x6%hOY
E0KxMRLI3~&

diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 02064f74..84c4f19c 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -154,7 +154,7 @@ SYSDYN.Module <T STR.Component
 SYSDYN.ModuleSymbol <T DIA.FontProvider <T DIA.ColorProvider
     @MOD.defSymbol "ModuleSymbol" SYSDYN.Module
     STR.IsDefinedBy _ : DIA.Composite
-        @L0.list  
+        @L0.orderedSet  
             _ : SYSDYN.SysdynTerminal
                 @MOD.terminal SYSDYN.ModuleSymbol SYSDYN.IsHeadOfTerminal
             _ : SYSDYN.SysdynTerminal
@@ -398,7 +398,7 @@ SYSDYN.ValveSymbol <T DIA.FontProvider <T DIA.ColorProvider
     @MOD.defSymbol "Valve" SYSDYN.Valve
     L0.IsDependencyOf BasicSymbols
     STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext 
-        @L0.list 
+        @L0.orderedSet 
             _ : SYSDYN.SysdynTerminal
                 @MOD.terminal SYSDYN.ValveSymbol SYSDYN.IsHeadOfTerminal
             _ : SYSDYN.SysdynTerminal
@@ -413,7 +413,7 @@ SYSDYN.AuxiliarySymbol <T DIA.FontProvider <T DIA.ColorProvider
     @MOD.defSymbol "Auxiliary" SYSDYN.Auxiliary
     L0.IsDependencyOf BasicSymbols
     STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext 
-        @L0.list 
+        @L0.orderedSet 
             _ : SYSDYN.SysdynTerminal
                 @MOD.terminal SYSDYN.AuxiliarySymbol SYSDYN.IsHeadOfTerminal
             _ : SYSDYN.SysdynTerminal
@@ -428,7 +428,7 @@ SYSDYN.CloudSymbol <T DIA.FontProvider <T DIA.ColorProvider
     @MOD.defSymbol "Cloud" SYSDYN.Cloud
     L0.IsDependencyOf BasicSymbols
     STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext 
-        @L0.list 
+        @L0.orderedSet 
             _ : SYSDYN.SysdynTerminal
                 @MOD.terminal SYSDYN.CloudSymbol SYSDYN.IsHeadOfTerminal
             _ : SYSDYN.SysdynTerminal
@@ -443,7 +443,7 @@ SYSDYN.InputSymbol <T DIA.FontProvider <T DIA.ColorProvider
     @MOD.defSymbol "Input" SYSDYN.Input
     L0.IsDependencyOf BasicSymbols
     STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext 
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.SysdynTerminal
                 @MOD.terminal SYSDYN.InputSymbol SYSDYN.IsHeadOfTerminal
             _ : SYSDYN.SysdynTerminal
@@ -458,7 +458,7 @@ SYSDYN.StockSymbol <T DIA.FontProvider <T DIA.ColorProvider
     @MOD.defSymbol "Stock" SYSDYN.Stock
     L0.IsDependencyOf BasicSymbols
     STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext 
-        @L0.list 
+        @L0.orderedSet 
             _ : SYSDYN.SysdynTerminal
                 @MOD.terminal SYSDYN.StockSymbol SYSDYN.IsHeadOfTerminal
             _ : SYSDYN.SysdynTerminal
diff --git a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
index 4f68f660..44a7e991 100644
--- a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
@@ -69,7 +69,7 @@ WM.conf_dependency_ref : L0.Template
 WM.WorkSymbol <T SYSDYN.ModuleSymbol
   MOD.SymbolToComponentType WM.WorkModel.WorkModule
   STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext
-      @L0.list 
+      @L0.orderedSet 
           _ : SYSDYN.SysdynTerminal
             @MOD.terminal SYSDYN.ModuleSymbol SYSDYN.IsHeadOfTerminal
           _ : SYSDYN.SysdynTerminal
@@ -78,7 +78,7 @@ WM.WorkSymbol <T SYSDYN.ModuleSymbol
 WM.WorkforceSymbol <T SYSDYN.ModuleSymbol
   MOD.SymbolToComponentType WM.WorkModel.WorkforceModule
   STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext
-      @L0.list 
+      @L0.orderedSet 
           _ : SYSDYN.SysdynTerminal
             @MOD.terminal SYSDYN.ModuleSymbol SYSDYN.IsHeadOfTerminal
           _ : SYSDYN.SysdynTerminal
@@ -114,26 +114,26 @@ WC.Work2 : WM.WorkModel.WorkModule
 WC.Work1CompletionTime : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "15"      
 WC.Work2CompletionTime : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped    
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "11"     
 WC.Work2Amount : SYSDYN.Auxiliary
       @L0.tag MOD.Mapped    
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "700"     
         
 // Enumeration Test
 WC.EnumerationTest : SYSDYN.Enumeration
     SYSDYN.HasEnumerationIndexes _ : SYSDYN.EnumerationIndexes
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.EnumerationIndex
                 L0.HasName "Moro" : L0.String
             _ : SYSDYN.EnumerationIndex
@@ -155,7 +155,7 @@ WC.Work2WorkDone : SYSDYN.Input
 WC.RequiredWorkingSpeedTotal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "RequiredWorkingSpeed1+RequiredWorkingSpeed2"                            
           
@@ -201,7 +201,7 @@ WorkModelConfigurationDiagram : SYSDYN.ConfigurationDiagram <R L0.HasNext
             @L0.symmetric
     L0X.HasTrigger _ : SYSDYN.DiagramToCompositeMapping
 // DIA.NavigationEnabled "false" 
-    @L0.list
+    @L0.orderedSet
         WorkforceElement : WM.WorkforceSymbol
             MOD.ElementToComponent WC.Workforce
             DIA.HasTransform [1.0, 0.0, 0.0, 1.0, 101.0, 50.0] : G2D.Transform
@@ -292,13 +292,13 @@ WMC = WM.WorkModel.WorkModuleConfiguration : SYSDYN.Configuration
 WMC.MaximumWorkingSpeed : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "500"      
 WMC.WorkQuality : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "0.9"  
                                      
@@ -306,25 +306,25 @@ WMC.WorkQuality : SYSDYN.Auxiliary
 WMC.WorkingSpeed : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if ProjectIsReady  < 1 then WorkAllocation else 0" 
 WMC.ErrorsGenerated : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "(1-WorkQuality)*WorkingSpeed"                                                          
 WMC.ErrorsFoundRate : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "Errors/ErrorsFoundTime"    
 WMC.ProjectReadyness : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "(xidz(WorkDone, ProjectWorkAmount, 0.0) - ProjectIsReady) / 0.08"                       
         
@@ -334,26 +334,26 @@ WMC.ProjectReadyness : SYSDYN.Valve
 WMC.WorkToDo : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "ProjectWorkAmount"      
 WMC.WorkDone : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "0"     
       @L0.tag SYSDYN.IsOutput
 WMC.Errors : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "0"           
 WMC.ProjectIsReady : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "0"                 
         
@@ -361,26 +361,26 @@ WMC.ProjectIsReady : SYSDYN.Stock
 WMC.TimeToDeadline : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "max(0, WorkCompletionTimeInput-time)"      
 WMC.RequiredWorkingSpeed : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     @L0.tag SYSDYN.IsOutput
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if ProjectIsReady < 1 then xidz(WorkToDo, TimeToDeadline, MaximumWorkingSpeed) else 0"      
 WMC.WorkAllocation : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "xidz(RequiredWorkingSpeed, RequiredWorkingSpeedTotalInput, 0.0) * PossibleWorkingSpeedInput"      
 WMC.ErrorsFoundTime : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.WithLookupExpression
                 SYSDYN.HasEquation "xidz(WorkDone, ProjectWorkAmount, 0.0)"    
                 SYSDYN.HasLookup "{{0,5},{0.5,3},{1,0.5},{2,0.5}}"    
@@ -470,7 +470,7 @@ WorkModuleConfigurationDiagram : SYSDYN.ConfigurationDiagram <R L0.HasNext
         DIA.HasVisibleTag TAGS.AdminIsVisible
 */
     L0X.HasTrigger _ : SYSDYN.DiagramToCompositeMapping
-    @L0.list
+    @L0.orderedSet
         WorkCompletionTimeInputElement : SYSDYN.InputSymbol
             MOD.ElementToComponent WMC.WorkCompletionTimeInput
             DIA.HasTransform [1.0, 0.0, 0.0, 1.0, 60.0, 55.0] : G2D.Transform           
@@ -628,13 +628,13 @@ WFC = WM.WorkModel.WorkforceModuleConfiguration : SYSDYN.Configuration
 WFC.TimeToAllocateResources : SYSDYN.Auxiliary
       @L0.tag MOD.Mapped
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "2"     
 WFC.Productivity : SYSDYN.Auxiliary
       @L0.tag MOD.Mapped      
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.ParameterExpression
                 SYSDYN.HasEquation "1"       
     
@@ -642,7 +642,7 @@ WFC.Productivity : SYSDYN.Auxiliary
 WFC.NetResources : SYSDYN.Valve
       @L0.tag MOD.Mapped
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "(WorkForceRequired-WorkforceStock)/TimeToAllocateResources"       
 
@@ -650,7 +650,7 @@ WFC.NetResources : SYSDYN.Valve
 WFC.WorkforceStock : SYSDYN.Stock
       @L0.tag MOD.Mapped
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "0"         
     
@@ -658,14 +658,14 @@ WFC.WorkforceStock : SYSDYN.Stock
 WFC.WorkForceRequired : SYSDYN.Auxiliary
       @L0.tag MOD.Mapped
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "RequiredWorkingSpeedInput/Productivity"      
 WFC.PossibleWorkingSpeed : SYSDYN.Auxiliary
       @L0.tag MOD.Mapped
       @L0.tag SYSDYN.IsOutput
       SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "WorkforceStock*Productivity"      
                 
@@ -705,7 +705,7 @@ WorkforceModuleConfigurationDiagram : SYSDYN.ConfigurationDiagram <R L0.HasNext
 */
     L0X.HasTrigger _ : SYSDYN.DiagramToCompositeMapping
   
-    @L0.list
+    @L0.orderedSet
         TimeToAllocateResourcesElement : SYSDYN.AuxiliarySymbol
             MOD.ElementToComponent WFC.TimeToAllocateResources
             DIA.HasTransform [1.0, 0.0, 0.0, 1.0, 45.0, 75.0] : G2D.Transform   
diff --git a/org.simantics.sysdyn.ontology/mdl2pgraph.pl b/org.simantics.sysdyn.ontology/mdl2pgraph.pl
index dc58c5ed..4c049c79 100755
--- a/org.simantics.sysdyn.ontology/mdl2pgraph.pl
+++ b/org.simantics.sysdyn.ontology/mdl2pgraph.pl
@@ -433,7 +433,7 @@ foreach my $key (keys (%$diagrams)) {
           	    $output .= $WC.".".$elements->{$n}->{'name'}." : SYSDYN.Valve\n";
           	    $output .= "    \@L0.tag MOD.Mapped\n";
           	    $output .= "    SYSDYN.HasExpressions _ : SYSDYN.Expressions\n";
-          	    $output .= "        \@L0.list\n";
+          	    $output .= "        \@L0.orderedSet\n";
                 my $equations = $elements->{$n}->{'equations'};
                 foreach my $equation (@$equations) {
           	        $output .= "            _ : SYSDYN.NormalExpression\n";
@@ -443,7 +443,7 @@ foreach my $key (keys (%$diagrams)) {
           	    $output .= $WC.".".$elements->{$n}->{'name'}." : SYSDYN.Stock\n";
         	    $output .= "    \@L0.tag MOD.Mapped\n";
           	    $output .= "    SYSDYN.HasExpressions _ : SYSDYN.Expressions\n";
-          	    $output .= "        \@L0.list\n";
+          	    $output .= "        \@L0.orderedSet\n";
                 my $equations = $elements->{$n}->{'equations'};
                 foreach my $equation (@$equations) {
           	        $output .= "            _ : SYSDYN.StockExpression\n";
@@ -454,7 +454,7 @@ foreach my $key (keys (%$diagrams)) {
           	    $output .= $WC.".".$elements->{$n}->{'name'}." : SYSDYN.Auxiliary\n";
         	    $output .= "    \@L0.tag MOD.Mapped\n";
           	    $output .= "    SYSDYN.HasExpressions _ : SYSDYN.Expressions\n";
-          	    $output .= "        \@L0.list\n";
+          	    $output .= "        \@L0.orderedSet\n";
                 my $equations = $elements->{$n}->{'equations'};
                 foreach my $equation (@$equations) {
           	        $output .= "            _ : SYSDYN.NormalExpression\n";
@@ -509,7 +509,7 @@ foreach my $key (keys (%$diagrams)) {
         $output .= "        DIA.HasVisibleTag TAGS.AdminIsVisible <R DIA.IsVisible\n";
         $output .= "            \@L0.symmetric\n";
         $output .= "    L0.HasTrigger _ : SYSDYN.DiagramToCompositeMapping\n";
-        $output .= "    \@L0.list\n";
+        $output .= "    \@L0.orderedSet\n";
     }
     my $offset_x = $max_x;
     no warnings 'uninitialized';
diff --git a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep
index e76d64bf..f4b7e54c 100644
--- a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep
+++ b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep
@@ -73,7 +73,7 @@ CMC = WM.CancerModel.CancerModelConfiguration : SYSDYN.Configuration
 CMC.LungCProgressIAIVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIAIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -84,31 +84,31 @@ CMC.LungCProgressIAIVRate : SYSDYN.Auxiliary
 CMC.LungCT1Progresses : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCNotProgressing1[Type,Stage,Gender,Age]*LungCT1ProgressesRate[Type,Stage,Age,Gender]" 
 CMC.LungCProgressIAIB : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIAIBRate[Type,Age,Gender]*LungCsIANoD[Type,Gender,Age]" 
 CMC.LungCT1Death : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCT1Disabling[Type,Stage,Gender,Age]*LungCT1DeathRate[Type,Stage,Age,Gender]" 
 CMC.LungCHealthyPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCHealthy[Gender,Age]*LungCModelPopCorrectionFactor[Gender,Age]" 
 CMC.LungCsIADiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIASm')" 
             _ : SYSDYN.NormalExpression
@@ -119,19 +119,19 @@ CMC.LungCsIADiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCProgress03IV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgress03IVRate[Type,Age,Gender]*LungCs03[Type,Gender,Age]" 
 CMC.LungCsIIIBNoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIIIBNoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIIIBNoD[Type,Gender,Age], -1) else -LungCsIIIBNoD[Type,Gender,Age]+VECTOR_MAP(LungCsIIIBNoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCProgressIBIVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIBIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -142,62 +142,62 @@ CMC.LungCProgressIBIVRate : SYSDYN.Auxiliary
 CMC.LungCOutputs02NosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs02Diagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCProgressIIAIV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIAIVRate[Type,Age,Gender]*LungCsIIANoD[Type,Gender,Age]" 
 CMC.LungCTherapy1Mortality : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCFirstTreatmentRate*(LungCD[Type,Stage,Gender,Age]*LungCTherapy1Ratio[Type,Stage,Age,Gender])*LungCTherapy1MortalityRatio/100" 
 CMC.LungCCured1PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCCured1[Type,Stage,Gender,Age]" 
 CMC.LungCProgress01IV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgress01IVRate[Type,Age,Gender]*LungCs01[Type,Gender,Age]" 
 CMC.LungCs03Diagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCs03DiagnosisRate[Type,Age,Gender]*LungCs03[Type,Gender,Age]" 
 CMC.LungCs03PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCs03[Type,Gender,Age]" 
 CMC.LungCProgressIAIIA : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIAIIARate[Type,Age,Gender]*LungCsIANoD[Type,Gender,Age]" 
 CMC.LungCDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCD[Type,Stage,Gender,Age]" 
 CMC.LungCsIIIADiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -208,21 +208,21 @@ CMC.LungCsIIIADiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCOutputsIANsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIANoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputTherapy1 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapy1[Type!,Stage!,Gender!,Age!])+sum(LungCTherapyCure1[Type!,Stage!,Gender!,Age!])+sum(LungCTherapy1Mortality[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCT2ProgressesRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT2Re01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -287,20 +287,20 @@ CMC.LungCT2ProgressesRate : SYSDYN.Auxiliary
 CMC.LungCOutputTherapy2Cure : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapyCure2[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCT2Progresses : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCNotProgressing2[Type,Stage,Gender,Age]*LungCT2ProgressesRate[Type,Stage,Age,Gender]" 
 CMC.LungCT1ProgToDisablingRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT1Di01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -365,78 +365,78 @@ CMC.LungCT1ProgToDisablingRate : SYSDYN.Auxiliary
 CMC.LungCProgressIIBIIIB : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIBIIIBRate[Type,Age,Gender]*LungCsIIBNoD[Type,Gender,Age]" 
 CMC.LungCsIIIANoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIIIANoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIIIANoD[Type,Gender,Age], -1) else -LungCsIIIANoD[Type,Gender,Age]+VECTOR_MAP(LungCsIIIANoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputsIBNsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIBDiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputRelapse : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT1Progresses[Type!,Stage!,Gender!,Age!])+sum(LungCT2Progresses[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCT1Deceased : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "0" 
 
 CMC.LungCT1DisablingPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCT1Disabling[Type,Stage,Gender,Age]" 
 CMC.LungCOutputsIAScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIADiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCProgressIBIV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIBIVRate[Type,Age,Gender]*LungCsIBNoD[Type,Gender,Age]" 
 CMC.LungCsIVDiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIVDiagnosisRate[Type,Age,Gender]*LungCsIVNoD[Type,Gender,Age]" 
 CMC.LungCOutputsIIIBScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIBDiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCsIIADiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIIADiagnosisRate[Type,Age,Gender]*LungCsIIANoD[Type,Gender,Age]" 
 CMC.LungCTherapy1Ratio : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT1Ra01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -501,25 +501,25 @@ CMC.LungCTherapy1Ratio : SYSDYN.Auxiliary
 CMC.LungCsIBNoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCsIBNoD[Type,Gender,Age]" 
 CMC.LungCsIANoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIANoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIANoD[Type,Gender,Age], -1) else -LungCsIANoD[Type,Gender,Age]+VECTOR_MAP(LungCsIANoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCCured1Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCCured1[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCCured1[Type,Stage,Gender,Age], -1) else -LungCCured1[Type,Stage,Gender,Age]+VECTOR_MAP(LungCCured1[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCProgress03IARate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'P03IASm')" 
             _ : SYSDYN.NormalExpression
@@ -530,20 +530,20 @@ CMC.LungCProgress03IARate : SYSDYN.Auxiliary
 CMC.LungCT1Disabling : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCT1DisablingIniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCCured2PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCCured2[Type,Stage,Gender,Age]" 
 CMC.LungCTreated2IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT2TrIASm')" 
             _ : SYSDYN.NormalExpression
@@ -608,7 +608,7 @@ CMC.LungCTreated2IniVal : SYSDYN.Auxiliary
 CMC.LungCsIIBDiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -619,27 +619,27 @@ CMC.LungCsIIBDiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCOutputNoDSc : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCOutputs01ScNoD+LungCOutputs02ScNoD+LungCOutputs03ScNoD+LungCOutputsIAScNoD+LungCOutputsIBScNoD+LungCOutputsIIAScNoD+LungCOutputsIIBScNoD+LungCOutputsIIIAScNoD+LungCOutputsIIIBScNoD+LungCOutputsIVScNoD" 
 
 CMC.LungCOutputsIANsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIADiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCTherapy2Failed : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCFirstTreatmentRate*(LungCD[Type,Stage,Gender,Age]*LungCTherapy2Ratio[Type,Stage,Age,Gender])*LungCTherapy2FailRatio/100" 
 CMC.LungCProgressIIBIIIARate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIBIIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -650,51 +650,51 @@ CMC.LungCProgressIIBIIIARate : SYSDYN.Auxiliary
 CMC.LungCProgressIBIIB : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIBIIBRate[Type,Age,Gender]*LungCsIBNoD[Type,Gender,Age]" 
 CMC.LungCsIIIBNoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIIIBNoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCD[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCD[Type,Stage,Gender,Age], -1) else -LungCD[Type,Stage,Gender,Age]+VECTOR_MAP(LungCD[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputProgressing2 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT2Progressing[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCT1ProgressingAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCT1Progressing[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCT1Progressing[Type,Stage,Gender,Age], -1) else -LungCT1Progressing[Type,Stage,Gender,Age]+VECTOR_MAP(LungCT1Progressing[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCT1ProgToDisabling : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCT1Progressing[Type,Stage,Gender,Age]*LungCT1ProgToDisablingRate[Type,Stage,Age,Gender]" 
 CMC.LungCT2ProgressingPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCT2Progressing[Type,Stage,Gender,Age]" 
 CMC.LungCInception : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCHealthy[Gender,Age]*LungCSmokersPercentageOfPopulation[Age,Gender]/100*LungCInceptionRate[Small,Age,Gender]" 
             _ : SYSDYN.NormalExpression
@@ -704,71 +704,71 @@ CMC.LungCInception : SYSDYN.Valve
 CMC.LungCTherapyCure2 : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCFirstTreatmentRate*(LungCD[Type,Stage,Gender,Age]*LungCTherapy2Ratio[Type,Stage,Age,Gender]*LungCTherapy2CureRatio[Type,Stage,Age,Gender])*(1-LungCTherapy2FailRatio/100)" 
 CMC.LungCCured1 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCCured1IniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCBirth : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "TotalPopulationBirth[Gender]" 
 CMC.LungCT2ProgressingAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCT2Progressing[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCT2Progressing[Type,Stage,Gender,Age], -1) else -LungCT2Progressing[Type,Stage,Gender,Age]+VECTOR_MAP(LungCT2Progressing[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCTherapy1 : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCFirstTreatmentRate*(LungCD[Type,Stage,Gender,Age]*LungCTherapy1Ratio[Type,Stage,Age,Gender]*(1-LungCTherapy1CureRatio[Type,Stage,Age,Gender]))*(1-LungCTherapy1MortalityRatio/100)" 
 CMC.LungCOutputNoDNs : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCOutputs01NsNoD+LungCOutputs02NsNoD+LungCOutputs03NsNoD+LungCOutputsIANsNoD+LungCOutputsIBNsNoD+LungCOutputsIIANsNoD+LungCOutputsIIBNsNoD+LungCOutputsIIIANsNoD+LungCOutputsIIIBNsNoD+LungCOutputsIVNsNoD" 
 
 CMC.LungCProgressIIAIIIA : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIAIIIARate[Type,Age,Gender]*LungCsIIANoD[Type,Gender,Age]" 
 CMC.LungCs01PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCs01[Type,Gender,Age]" 
 CMC.LungCOutputsIIBNosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIBDiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCModelPop : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "0.1+LungCHealthy[Gender,Age]+LungCNoDSum[Gender,Age]+sum(LungCD[Type!,Stage!,Gender,Age])+sum(LungCCured1[Type!,Stage!,Gender,Age])+sum(LungCNotProgressing1[Type!,Stage!,Gender,Age])+sum(LungCT1Progressing[Type!,Stage!,Gender,Age])+sum(LungCT1Disabling[Type!,Stage!,Gender,Age])+sum(LungCCured2[Type!,Stage!,Gender,Age])+sum(LungCNotProgressing2[Type!,Stage!,Gender,Age])+sum(LungCT2Progressing[Type!,Stage!,Gender,Age])+sum(LungCT2Disabling[Type!,Stage!,Gender,Age])" 
 
 CMC.LungCProgressIIIAIIIBRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIIAIIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -779,39 +779,39 @@ CMC.LungCProgressIIIAIIIBRate : SYSDYN.Auxiliary
 CMC.LungCProgress0203 : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgress0203Rate[Type,Age,Gender]*LungCs02[Type,Gender,Age]" 
 CMC.LungCOutputsIIBNosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIBNoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCsIIBDiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIIBDiagnosisRate[Type,Age,Gender]*LungCsIIBNoD[Type,Gender,Age]" 
 CMC.LungCOutputs03ScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs03[Small,Gender!,Age!])" 
 
 CMC.LungCsIIIBNoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCsIIIBNoD[Type,Gender,Age]" 
 CMC.LungCsIIANoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -822,7 +822,7 @@ CMC.LungCsIIANoDIniVal : SYSDYN.Auxiliary
 CMC.LungCProgress02IVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'P02IVSm')" 
             _ : SYSDYN.NormalExpression
@@ -833,41 +833,41 @@ CMC.LungCProgress02IVRate : SYSDYN.Auxiliary
 CMC.LungCOutputs01ScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCT2Progressing : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCT2ProgressingIniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCT2Death : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCT2Disabling[Type,Stage,Gender,Age]*LungCT2DeathRate[Type,Stage,Age,Gender]" 
 CMC.LungCOutputsIIAScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIADiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCsIBNoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIBNoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCT1DisablingIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT1DiIASm')" 
             _ : SYSDYN.NormalExpression
@@ -932,60 +932,60 @@ CMC.LungCT1DisablingIniVal : SYSDYN.Auxiliary
 CMC.LungCNotProgressing1 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCTreated1IniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCOutputsIBScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIBDiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCOutputProgressing1 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT1Progressing[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCProgressIIIAIV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIIAIVRate[Type,Age,Gender]*LungCsIIIANoD[Type,Gender,Age]" 
 CMC.LungCProgressIAIV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIAIVRate[Type,Age,Gender]*LungCsIANoD[Type,Gender,Age]" 
 CMC.LungCsIADiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIADiagnosisRate[Type,Age,Gender]*LungCsIANoD[Type,Gender,Age]" 
 CMC.LungCOutputsIVNsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIVDiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIBNsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIBDiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCProgress01IVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'P01IVSm')" 
             _ : SYSDYN.NormalExpression
@@ -996,33 +996,33 @@ CMC.LungCProgress01IVRate : SYSDYN.Auxiliary
 CMC.LungCProgressIIAIIB : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIAIIBRate[Type,Age,Gender]*LungCsIIANoD[Type,Gender,Age]" 
 CMC.LungCOutputNotProgressing1 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCNotProgressing1[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCsIIANoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCsIIANoD[Type,Gender,Age]" 
 CMC.LungCOutputsIIBNsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIBNoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCProgressIIAIIBRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIAIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -1033,7 +1033,7 @@ CMC.LungCProgressIIAIIBRate : SYSDYN.Auxiliary
 CMC.LungCProgress0203Rate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'P0203Sm')" 
             _ : SYSDYN.NormalExpression
@@ -1044,13 +1044,13 @@ CMC.LungCProgress0203Rate : SYSDYN.Auxiliary
 CMC.LungCsIIBNoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCsIIBNoD[Type,Gender,Age]" 
 CMC.LungCSmokersPercentageOfPopulation : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_DATA('LCancer.xls', 'LungC_Risk', 'PSmokingMenT', 'PSmokingMen')" 
             _ : SYSDYN.NormalExpression
@@ -1059,60 +1059,60 @@ CMC.LungCSmokersPercentageOfPopulation : SYSDYN.Auxiliary
 CMC.LungCOutputsIVScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIVDiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCs01Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCs01[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCs01[Type,Gender,Age], -1) else -LungCs01[Type,Gender,Age]+VECTOR_MAP(LungCs01[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputsIBNosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIBNoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCs02 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCs02IniVal[Type,Age,Gender]" 
 
 CMC.LungCCausedDeath : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT1Death[Type!,Stage!,Gender,Age])+sum(LungCT2Death[Type!,Stage!,Gender,Age])+sum(LungCTherapy1Mortality[Type!,Stage!,Gender,Age])" 
 
 CMC.LungCsIBDiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIBNoD[Type,Gender,Age]*LungCsIBDiagnosisRate[Type,Age,Gender]" 
 CMC.LungCProgressIIBIV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIBIVRate[Type,Age,Gender]*LungCsIIBNoD[Type,Gender,Age]" 
 CMC.LungCOutputCured2 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCCured2[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCsIBDiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -1123,27 +1123,27 @@ CMC.LungCsIBDiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCTherapy1MortalityRatio : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT1Mor')" 
 
 CMC.LungCTreated1PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCNotProgressing1[Type,Stage,Gender,Age]" 
 CMC.LungCOutputTherapy2 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapy2[Type!,Stage!,Gender!,Age!])+sum(LungCTherapyCure2[Type!,Stage!,Gender!,Age!])+sum(LungCTherapy2Failed[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCsIIBNoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -1154,7 +1154,7 @@ CMC.LungCsIIBNoDIniVal : SYSDYN.Auxiliary
 CMC.LungCs03DiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PD03Sm')" 
             _ : SYSDYN.NormalExpression
@@ -1165,7 +1165,7 @@ CMC.LungCs03DiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCsIIIANoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -1176,32 +1176,32 @@ CMC.LungCsIIIANoDIniVal : SYSDYN.Auxiliary
 CMC.LungCTreated1Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCNotProgressing1[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCNotProgressing1[Type,Stage,Gender,Age], -1) else -LungCNotProgressing1[Type,Stage,Gender,Age]+VECTOR_MAP(LungCNotProgressing1[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCT2DisablingPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCT2Disabling[Type,Stage,Gender,Age]" 
 CMC.LungCOutputs03ScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs03Diagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCProgressIIIBIV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIIBIVRate[Type,Age,Gender]*LungCsIIIBNoD[Type,Gender,Age]" 
 CMC.LungCProgressIIIBIVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIIBIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -1212,7 +1212,7 @@ CMC.LungCProgressIIIBIVRate : SYSDYN.Auxiliary
 CMC.LungCProgressIIIAIVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIIAIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -1223,13 +1223,13 @@ CMC.LungCProgressIIIAIVRate : SYSDYN.Auxiliary
 CMC.LungCT2ProgToDisabling : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCT2Progressing[Type,Stage,Gender,Age]*LungCT2ProgToDisablingRate[Type,Stage,Age,Gender]" 
 CMC.LungCProgress03IVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'P03IVSm')" 
             _ : SYSDYN.NormalExpression
@@ -1240,28 +1240,28 @@ CMC.LungCProgress03IVRate : SYSDYN.Auxiliary
 CMC.LungCOutputs03NosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs03[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIAScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIADiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCOutputsIIBScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIBNoD[Small,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIBNosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIBDiagnosis[NotSmoker,Gender!,Age!])" 
 
@@ -1270,42 +1270,42 @@ CMC.Cloud45 : SYSDYN.Cloud
 CMC.LungCOutputs03NosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs03Diagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCOutputs03NsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs03Diagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputsIBNosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIBDiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIANsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIANoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCHealthy : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCHealthyIniVal[Age,Gender]" 
 
 CMC.LungCs01DiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PD01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -1316,7 +1316,7 @@ CMC.LungCs01DiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCTreated1IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT1TrIASm')" 
             _ : SYSDYN.NormalExpression
@@ -1381,7 +1381,7 @@ CMC.LungCTreated1IniVal : SYSDYN.Auxiliary
 CMC.LungCProgressIBIIBRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIBIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -1392,26 +1392,26 @@ CMC.LungCProgressIBIIBRate : SYSDYN.Auxiliary
 CMC.LungCsIIBNoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIIBNoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIIBNoD[Type,Gender,Age], -1) else -LungCsIIBNoD[Type,Gender,Age]+VECTOR_MAP(LungCsIIBNoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCProgressIIIAIIIB : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIIIANoD[Type,Gender,Age]*LungCProgressIIIAIIIBRate[Type,Age,Gender]" 
 CMC.LungCOutputsIVNsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIVNoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCT1ProgressingIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT1PrIASm')" 
             _ : SYSDYN.NormalExpression
@@ -1476,79 +1476,79 @@ CMC.LungCT1ProgressingIniVal : SYSDYN.Auxiliary
 CMC.LungCs02Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCs02[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCs02[Type,Gender,Age], -1) else -LungCs02[Type,Gender,Age]+VECTOR_MAP(LungCs02[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputDisabling1 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT1Disabling[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIANsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIADiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCsIIANoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIIANoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIIANoD[Type,Gender,Age], -1) else -LungCsIIANoD[Type,Gender,Age]+VECTOR_MAP(LungCsIIANoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputsIIIANosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIANoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCProgress03IA : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgress03IARate[Type,Age,Gender]*LungCs03[Type,Gender,Age]" 
 CMC.LungCOutputsIIIANosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIADiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCTreated2PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCNotProgressing2[Type,Stage,Gender,Age]" 
 CMC.LungCsIIIBDiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIIIBDiagnosisRate[Type,Age,Gender]*LungCsIIIBNoD[Type,Gender,Age]" 
 CMC.LungCInceptionRateChanges : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_DATA('LCancer.xls', 'LungC_Risk', 'B', 'C147')" 
 
 CMC.LungCNotProgressing2 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCTreated2IniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCProgressIIBIVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIBIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -1559,66 +1559,66 @@ CMC.LungCProgressIIBIVRate : SYSDYN.Auxiliary
 CMC.LungCs02Diagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCs02DiagnosisRate[Type,Age,Gender]*LungCs02[Type,Gender,Age]" 
 CMC.LungCFirstTreatmentRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "10" 
 
 CMC.LungCCured2 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCCured2IniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCOutputs02NosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs02[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCOutputs02ScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs02[Small,Gender!,Age!])" 
 
 CMC.LungCProgressIIBIIIA : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgressIIBIIIARate[Type,Age,Gender]*LungCsIIBNoD[Type,Gender,Age]" 
 CMC.LungCs03Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCs03[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCs03[Type,Gender,Age], -1) else -LungCs03[Type,Gender,Age]+VECTOR_MAP(LungCs03[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputNsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[NonSmall,Gender!,Age!])+sum(LungCs02Diagnosis[NonSmall,Gender!,Age!])+sum(LungCs03Diagnosis[NonSmall,Gender!,Age!])+sum(LungCsIADiagnosis[NonSmall,Gender!,Age!])+sum(LungCsIBDiagnosis[NonSmall,Gender!,Age!])+sum(LungCsIIADiagnosis[NonSmall,Gender!,Age!])+sum(LungCsIIBDiagnosis[NonSmall,Gender!,Age!])+sum(LungCsIIIADiagnosis[NonSmall,Gender!,Age!])+sum(LungCsIIIBDiagnosis[NonSmall,Gender!,Age!])+sum(LungCsIVDiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCTherapyCure1 : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCFirstTreatmentRate*(LungCD[Type,Stage,Gender,Age]*LungCTherapy1Ratio[Type,Stage,Age,Gender]*LungCTherapy1CureRatio[Type,Stage,Age,Gender])*(1-LungCTherapy1MortalityRatio/100)" 
 CMC.LungCT2DisablingIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT2DiIASm')" 
             _ : SYSDYN.NormalExpression
@@ -1683,7 +1683,7 @@ CMC.LungCT2DisablingIniVal : SYSDYN.Auxiliary
 CMC.LungCsIBNoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -1694,14 +1694,14 @@ CMC.LungCsIBNoDIniVal : SYSDYN.Auxiliary
 CMC.LungCOutputModelPopExcludingHealthy : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPop[Gender,Age]-LungCHealthy[Gender,Age]" 
 
 CMC.LungCsIIADiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -1712,53 +1712,53 @@ CMC.LungCsIIADiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCProgress0102 : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgress0102Rate[Type,Age,Gender]*LungCs01[Type,Gender,Age]" 
 CMC.LungCsIVNoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIVNoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIVNoD[Type,Gender,Age], -1) else -LungCsIVNoD[Type,Gender,Age]+VECTOR_MAP(LungCsIVNoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCModelPopCorrectionRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "0.9" 
 
 CMC.LungCTherapy2 : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCFirstTreatmentRate*(LungCD[Type,Stage,Gender,Age]*LungCTherapy2Ratio[Type,Stage,Age,Gender]*(1-LungCTherapy2CureRatio[Type,Stage,Age,Gender]))*(1-LungCTherapy2FailRatio/100)" 
 CMC.LungCsIIANoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIIANoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCsIIIANoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIIIANoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCOutputsIVNosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIVDiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCTherapy2Ratio : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT2Ra01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -1823,87 +1823,87 @@ CMC.LungCTherapy2Ratio : SYSDYN.Auxiliary
 CMC.LungCOutputs01NosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCCured2Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCCured2[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCCured2[Type,Stage,Gender,Age], -1) else -LungCCured2[Type,Stage,Gender,Age]+VECTOR_MAP(LungCCured2[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCs03 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCs03IniVal[Type,Age,Gender]" 
 
 CMC.LungCOutputs03NsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs03[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputsIIANosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIANoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCsIIIANoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCsIIIANoD[Type,Gender,Age]" 
 CMC.LungCs01Diagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCs01DiagnosisRate[Type,Age,Gender]*LungCs01[Type,Gender,Age]" 
 CMC.LungCOutputs02NsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs02Diagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputsIANosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIADiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCProgress02IV : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCProgress02IVRate[Type,Age,Gender]*LungCs02[Type,Gender,Age]" 
 CMC.LungCT1Progressing : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCT1ProgressingIniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCOutputTherapy1Cure : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapyCure1[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCsIANoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIASm')" 
             _ : SYSDYN.NormalExpression
@@ -1914,27 +1914,27 @@ CMC.LungCsIANoDIniVal : SYSDYN.Auxiliary
 CMC.LungCOutputsIANosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIANoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCOutputTherapy1MortalityInTherapy : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapy1Mortality[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCTreated2Ageing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCNotProgressing2[Type,Stage,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCNotProgressing2[Type,Stage,Gender,Age], -1) else -LungCNotProgressing2[Type,Stage,Gender,Age]+VECTOR_MAP(LungCNotProgressing2[Type,Stage,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCs01IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INd01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -1945,14 +1945,14 @@ CMC.LungCs01IniVal : SYSDYN.Auxiliary
 CMC.LungCOutputDisabling2 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT2Disabling[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCT1ProgressesRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT1Re01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2017,54 +2017,54 @@ CMC.LungCT1ProgressesRate : SYSDYN.Auxiliary
 CMC.LungCs02PopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCs02[Type,Gender,Age]" 
 CMC.LungCOutputsIIAScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIANoD[Small,Gender!,Age!])" 
 
 CMC.LungCsIVNoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIVNoD[Type,Gender,Age]*LungCModelPopCorrectionFactor[Gender,Age]" 
 CMC.LungCoutputNoDNos : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCOutputs01NosNoD+LungCOutputs02NosNoD+LungCOutputs03NosNoD+LungCOutputsIANosNoD+LungCOutputsIBNosNoD+LungCOutputsIIANosNoD+LungCOutputsIIBNosNoD+LungCOutputsIIIANosNoD+LungCOutputsIIIBNosNoD+LungCOutputsIVNosNoD" 
 
 CMC.LungCOutputsIIANosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIADiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCs01 : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCs01IniVal[Type,Age,Gender]" 
 
 CMC.LungCOutputCured1 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCCured1[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCTherapy1CureRatio : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT1Cr01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2129,7 +2129,7 @@ CMC.LungCTherapy1CureRatio : SYSDYN.Auxiliary
 CMC.LungCsIIIBDiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -2140,7 +2140,7 @@ CMC.LungCsIIIBDiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCsIVDiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PDIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -2151,27 +2151,27 @@ CMC.LungCsIVDiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCOutputsIIBNsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIBDiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputModelPop : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCModelPop[Gender!,Age!])" 
 
 CMC.LungCsIANoDPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCsIANoD[Type,Gender,Age]" 
 CMC.LungCCured2IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT2CrIASm')" 
             _ : SYSDYN.NormalExpression
@@ -2236,48 +2236,48 @@ CMC.LungCCured2IniVal : SYSDYN.Auxiliary
 CMC.LungCModelPopCorrectionFactor : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionRate*(TotalPopulation[Gender,Age]/LungCModelPop[Gender,Age]-1)-(TotalPopulationDeath[Gender,Age]-LungCCausedDeath[Gender,Age])/LungCModelPop[Gender,Age]" 
 
 CMC.LungCTherapy2FailRatio : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT2Fail')" 
 
 CMC.LungCsIBNoDAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age0 then -LungCsIBNoD[Type,Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCsIBNoD[Type,Gender,Age], -1) else -LungCsIBNoD[Type,Gender,Age]+VECTOR_MAP(LungCsIBNoD[Type,Gender,Age], -1)*DummyRateForUnitsConversion" 
 CMC.LungCOutputNosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[NotSmoker,Gender!,Age!])+sum(LungCs02Diagnosis[NotSmoker,Gender!,Age!])+sum(LungCs03Diagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIADiagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIBDiagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIIADiagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIIBDiagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIIIADiagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIIIBDiagnosis[NotSmoker,Gender!,Age!])+sum(LungCsIVDiagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCOutputNotProgressing2 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCNotProgressing2[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIBNosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIBNoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCProgressIIBIIIBRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIBIIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -2288,21 +2288,21 @@ CMC.LungCProgressIIBIIIBRate : SYSDYN.Auxiliary
 CMC.LungCOutputT1Mortality : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT1Death[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIIIBNsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIBNoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IDiaIASm')" 
             _ : SYSDYN.NormalExpression
@@ -2367,14 +2367,14 @@ CMC.LungCDIniVal : SYSDYN.Auxiliary
 CMC.LungCOutputsIIANsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIANoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCProgressIIAIVRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIAIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -2385,21 +2385,21 @@ CMC.LungCProgressIIAIVRate : SYSDYN.Auxiliary
 CMC.LungCOutputs01ScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01[Small,Gender!,Age!])" 
 
 CMC.LungCOutputNoDSum : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCNoDSum[Gender!,Age!])" 
 
 CMC.LungCsIVNoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIVSm')" 
             _ : SYSDYN.NormalExpression
@@ -2410,27 +2410,27 @@ CMC.LungCsIVNoDIniVal : SYSDYN.Auxiliary
 CMC.LungCT1ProgressingPopCorr : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCModelPopCorrectionFactor[Gender,Age]*LungCT1Progressing[Type,Stage,Gender,Age]" 
 CMC.LungCOutputTherapy1NoCure : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapy1[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIVScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIVNoD[Small,Gender!,Age!])" 
 
 CMC.LungCProgress0102Rate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'P0102Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2441,28 +2441,28 @@ CMC.LungCProgress0102Rate : SYSDYN.Auxiliary
 CMC.LungCOutputDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[Type!,Gender!,Age!])+sum(LungCs02Diagnosis[Type!,Gender!,Age!])+sum(LungCs03Diagnosis[Type!,Gender!,Age!])+sum(LungCsIADiagnosis[Type!,Gender!,Age!])+sum(LungCsIBDiagnosis[Type!,Gender!,Age!])+sum(LungCsIIADiagnosis[Type!,Gender!,Age!])+sum(LungCsIIBDiagnosis[Type!,Gender!,Age!])+sum(LungCsIIIADiagnosis[Type!,Gender!,Age!])+sum(LungCsIIIBDiagnosis[Type!,Gender!,Age!])+sum(LungCsIVDiagnosis[Type!,Gender!,Age!])" 
 
 CMC.LungCOutputHealthyAndTreated : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCHealthy[Gender!,Age!])+sum(LungCNotProgressing2[Type!,Stage!,Gender!,Age!])+sum(LungCNotProgressing1[Type!,Stage!,Gender!,Age!])+sum(LungCCured1[Type!,Stage!,Gender!,Age!])+sum(LungCCured2[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIIANsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIADiagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCT2DeathRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT2Mo01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2527,7 +2527,7 @@ CMC.LungCT2DeathRate : SYSDYN.Auxiliary
 CMC.LungCProgressIAIBRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIAIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -2538,14 +2538,14 @@ CMC.LungCProgressIAIBRate : SYSDYN.Auxiliary
 CMC.LungCT2Deceased : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "0" 
 
 CMC.LungCs03IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INd03Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2556,27 +2556,27 @@ CMC.LungCs03IniVal : SYSDYN.Auxiliary
 CMC.LungCOutputs01NsDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[NonSmall,Gender!,Age!])" 
 
 CMC.LungCOutputs02NsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs02[NonSmall,Gender!,Age!])" 
 
 CMC.LungCsIIIADiagnosis : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "LungCsIIIADiagnosisRate[Type,Age,Gender]*LungCsIIIANoD[Type,Gender,Age]" 
 CMC.LungCTherapy2CureRatio : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT2Cr01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2641,21 +2641,21 @@ CMC.LungCTherapy2CureRatio : SYSDYN.Auxiliary
 CMC.LungCHealthyIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IHe')" 
 
 CMC.LungCOutputMortality : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCCausedDeath[Gender!,Age!])" 
 
 CMC.LungCs02IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INd02Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2666,21 +2666,21 @@ CMC.LungCs02IniVal : SYSDYN.Auxiliary
 CMC.LungCOutputScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[Small,Gender!,Age!])+sum(LungCs02Diagnosis[Small,Gender!,Age!])+sum(LungCs03Diagnosis[Small,Gender!,Age!])+sum(LungCsIADiagnosis[Small,Gender!,Age!])+sum(LungCsIBDiagnosis[Small,Gender!,Age!])+sum(LungCsIIADiagnosis[Small,Gender!,Age!])+sum(LungCsIIBDiagnosis[Small,Gender!,Age!])+sum(LungCsIIIADiagnosis[Small,Gender!,Age!])+sum(LungCsIIIBDiagnosis[Small,Gender!,Age!])+sum(LungCsIVDiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCOutputs01NsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01[NonSmall,Gender!,Age!])" 
 
 CMC.LungCT1DeathRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT1Mo01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2745,7 +2745,7 @@ CMC.LungCT1DeathRate : SYSDYN.Auxiliary
 CMC.LungCProgressIAIIARate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIAIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -2756,7 +2756,7 @@ CMC.LungCProgressIAIIARate : SYSDYN.Auxiliary
 CMC.LungCsIIIBNoDIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'INdIIIBSm')" 
             _ : SYSDYN.NormalExpression
@@ -2767,14 +2767,14 @@ CMC.LungCsIIIBNoDIniVal : SYSDYN.Auxiliary
 CMC.LungCOutputs01NosDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01Diagnosis[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCInceptionRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIncSm')" 
             _ : SYSDYN.NormalExpression
@@ -2785,7 +2785,7 @@ CMC.LungCInceptionRate : SYSDYN.Auxiliary
 CMC.LungCs02DiagnosisRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PD02Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2796,55 +2796,55 @@ CMC.LungCs02DiagnosisRate : SYSDYN.Auxiliary
 CMC.LungCNoDSum : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs01[Type!,Gender,Age])+sum(LungCs02[Type!,Gender,Age])+sum(LungCs03[Type!,Gender,Age])+sum(LungCsIANoD[Type!,Gender,Age])+sum(LungCsIBNoD[Type!,Gender,Age])+sum(LungCsIIANoD[Type!,Gender,Age])+sum(LungCsIIBNoD[Type!,Gender,Age])+sum(LungCsIIIANoD[Type!,Gender,Age])+sum(LungCsIIIBNoD[Type!,Gender,Age])+sum(LungCsIVNoD[Type!,Gender,Age])" 
 
 CMC.LungCOutputsIIIAScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIANoD[Small,Gender!,Age!])" 
 
 CMC.LungCHealthyAgeing : SYSDYN.Valve
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "(if Age==Age0 then -LungCHealthy[Gender,Age] elseif Age==Age100 then +VECTOR_MAP(LungCHealthy[Gender,Age], -1) else -LungCHealthy[Gender,Age]+VECTOR_MAP(LungCHealthy[Gender,Age], -1))*DummyRateForUnitsConversion" 
 CMC.LungCsIVNoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIVNoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCOutputsIIIBScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIIBNoD[Small,Gender!,Age!])" 
 
 CMC.LungCOutputs02ScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCs02Diagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCOutputsIBNsNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIBNoD[NonSmall,Gender!,Age!])" 
 
 CMC.LungCT2ProgToDisablingRate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PT2Di01Sm')" 
             _ : SYSDYN.NormalExpression
@@ -2909,14 +2909,14 @@ CMC.LungCT2ProgToDisablingRate : SYSDYN.Auxiliary
 CMC.LungCOutputsIAScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIANoD[Small,Gender!,Age!])" 
 
 CMC.LungCCured1IniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT1CrIASm')" 
             _ : SYSDYN.NormalExpression
@@ -2981,42 +2981,42 @@ CMC.LungCCured1IniVal : SYSDYN.Auxiliary
 CMC.LungCOutputT2Mortality : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCT2Death[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputTherapy2NoCure : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapy2[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIBScNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIBNoD[Small,Gender!,Age!])" 
 
 CMC.LungCOutputsIIBScDiagnosis : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIIBDiagnosis[Small,Gender!,Age!])" 
 
 CMC.LungCsIIBNoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIIBNoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCT2ProgressingIniVal : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'IT2PrIASm')" 
             _ : SYSDYN.NormalExpression
@@ -3081,35 +3081,35 @@ CMC.LungCT2ProgressingIniVal : SYSDYN.Auxiliary
 CMC.LungCOutputTherapy2Failed : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCTherapy2Failed[Type!,Stage!,Gender!,Age!])" 
 
 CMC.LungCOutputsIVNosNoD : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(LungCsIVNoD[NotSmoker,Gender!,Age!])" 
 
 CMC.LungCsIANoD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCsIANoDIniVal[Type,Age,Gender]" 
 
 CMC.LungCT2Disabling : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCT2DisablingIniVal[Type,Stage,Age,Gender]" 
 
 CMC.LungCProgressIIAIIIARate : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_CONSTANT('LCancer.xls', 'LungC_In', 'PIIAIIIASm')" 
             _ : SYSDYN.NormalExpression
@@ -3120,7 +3120,7 @@ CMC.LungCProgressIIAIIIARate : SYSDYN.Auxiliary
 CMC.LungCD : SYSDYN.Stock
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.StockExpression
                 SYSDYN.HasInitialEquation "LungCDIniVal[Type,sIA,Age,Gender]" 
             _ : SYSDYN.StockExpression
@@ -4188,42 +4188,42 @@ CMC.d242  : SYSDYN.Dependency
 CMC.TotalPopulationT1 : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "delay(TotalPopulation[Gender,Age], 1)" 
 
 CMC.TotalPopulationBirth : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "DummyRateForUnitsConversion*TotalPopulationT1[Gender,Age0]" 
 
 CMC.TotalPopulationMen : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_DATA('LCancer.xls', 'Population_In', '7', 'C113')" 
 
 CMC.OutputDataTotalPopulationMenSum : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(TotalPopulationMen[Age!])" 
 
 CMC.TotalPopulationWomen : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "XLS_DATA('LCancer.xls', 'Population_In', '7', 'C9')" 
 
 CMC.TotalPopulation : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "TotalPopulationMen[Age]" 
             _ : SYSDYN.NormalExpression
@@ -4232,21 +4232,21 @@ CMC.TotalPopulation : SYSDYN.Auxiliary
 CMC.OutputDataTotalPopulationWomenSum : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "sum(TotalPopulationWomen[Age!])" 
 
 CMC.DummyRateForUnitsConversion : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "1" 
 
 CMC.TotalPopulationDeath : SYSDYN.Auxiliary
     @L0.tag MOD.Mapped
     SYSDYN.HasExpressions _ : SYSDYN.Expressions
-        @L0.list
+        @L0.orderedSet
             _ : SYSDYN.NormalExpression
                 SYSDYN.HasEquation "if Age==Age99 then (TotalPopulation[Gender,Age99]+TotalPopulation[Gender,Age100]-TotalPopulationT1[Gender,Age100])/4 elseif Age==Age100 then (TotalPopulation[Gender,Age99]+TotalPopulation[Gender,Age100]-TotalPopulationT1[Gender,Age100])*3/4 else VECTOR_MAP(TotalPopulation[Gender,Age], 0)-VECTOR_MAP(TotalPopulationT1[Gender,Age], 1)*DummyRateForUnitsConversion" 
 
@@ -4280,7 +4280,7 @@ LungCancerConfigurationDiagram : SYSDYN.ConfigurationDiagram <R L0.HasNext
         DIA.HasVisibleTag TAGS.AdminIsVisible <R DIA.IsVisible
             @L0.symmetric
     L0.HasTrigger _ : SYSDYN.DiagramToCompositeMapping
-    @L0.list
+    @L0.orderedSet
       LungCProgressIAIVRateElement559 : SYSDYN.AuxiliarySymbol
           MOD.ElementToComponent CMC.LungCProgressIAIVRate
           DIA.HasTransform [1.0, 0.0, 0.0, 1.0, -343.2, -21.0] : G2D.Transform
-- 
2.47.1