diff --git a/uppsrc/Core/src.tpp/AMap_en-us.tpp b/uppsrc/Core/src.tpp/AMap_en-us.tpp
index 62fe54768..bdf4d2655 100644
--- a/uppsrc/Core/src.tpp/AMap_en-us.tpp
+++ b/uppsrc/Core/src.tpp/AMap_en-us.tpp
@@ -28,6 +28,7 @@ K`& x) method returning hash value for elements.&]
 random access container of values, forming map flavors. It is 
 used as base class for concrete map flavors, [* VectorMap], [* ArrayMap] 
 and [* SegtorMap].&]
+[s0;~~~.416; &]
 [s0;~~~.416; Like any other NTL container, AMap is [*/^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ m
 oveable][*/  ]type with [*/^topic`:`/`/Core`/srcdoc`/pick`_`$en`-us^ pick 
 and optional deep copy] transfer semantics, although these features 
@@ -606,8 +607,8 @@ NTL is used as part of UPP.&]
 [s7; [*C@3 s]-|Target/source stream.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AMap`:`:Swap`(AMap`&`):%- [@(0.0.255) void]_[* Swap]([_^AMap^ AMap][@(0.0.255) `&]_[*@3 x])
-&]
+[s5;:AMap`:`:Swap`(AMap`&`):%- [@(0.0.255) void]_[* Swap]([_^topic`:`/`/Core`/src`/AMap`_en`-us`#AMap`:`:class^ A
+Map][@(0.0.255) `&]_[*@3 x])&]
 [s2; Swap AMap content with another AMap (of the same type).&]
 [s3; &]
 [s4;%- &]
@@ -617,19 +618,20 @@ NTL is used as part of UPP.&]
 [s7; [*/ Return value]-|Constant reference to the Index of keys.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:Upp`:`:AMap`:`:PickIndex`(`):%- [_^Upp`:`:Index^ Index]<[*@4 K], 
-[*@4 HashFn]>_[* PickIndex]()&]
+[s5;:Upp`:`:AMap`:`:PickIndex`(`):%- [_^topic`:`/`/Core`/src`/Index`_en`-us`#Index`:`:class^ I
+ndex]<[*@4 K], [*@4 HashFn]>_[* PickIndex]()&]
 [s2; Returns Index of keys. Destroys AMap by picking.&]
 [s7; [*/ Return value]-|Index of keys.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AMap`:`:GetKeys`(`)const:%- [@(0.0.255) const]_Vector[@(0.0.255) <][*@4 K][@(0.0.255) >`&
-]_[* GetKeys]()_[@(0.0.255) const]&]
+[s5;:AMap`:`:GetKeys`(`)const:%- [@(0.0.255) const]_[_^topic`:`/`/Core`/src`/Vector`_en`-us`#Vector`:`:class^ V
+ector][@(0.0.255) <][*@4 K][@(0.0.255) >`&]_[* GetKeys]()_[@(0.0.255) const]&]
 [s2; Returns a constant reference to the Vector of keys.&]
 [s7; [*/ Return value]-|Constant reference to the Vector of keys.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:Upp`:`:AMap`:`:PickKeys`(`):%- [_^Upp`:`:Vector^ Vector]<[*@4 K]>_[* PickKeys]()&]
+[s5;:Upp`:`:AMap`:`:PickKeys`(`):%- [_^topic`:`/`/Core`/src`/Vector`_en`-us`#Vector`:`:class^ V
+ector]<[*@4 K]>_[* PickKeys]()&]
 [s2; Returns Vector of keys. Destroys AMap by picking.&]
 [s7; [*/ Return value]-|Vector of keys.&]
 [s3;%- &]
@@ -651,19 +653,21 @@ by picking.&]
 [s7; [*/ Return value]-|Basic random access container of values.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:Upp`:`:AMap`:`:operator`~`(`):%- [_^Upp`:`:MapKVRange^ MapKVRange]<[_^Upp`:`:AMap^ A
-Map]<[*@4 K], [*@4 T], [*@4 V]>, [*@4 K], [*@4 T]>_[* operator`~]()&]
-[s5;:Upp`:`:AMap`:`:operator`~`(`)const:%- [_^Upp`:`:MapKVRange^ MapKVRange]<[_^Upp`:`:AMap^ A
-Map]<[@(0.0.255) const]_[*@4 K], [*@4 T], [*@4 V]>, [*@4 K], [@(0.0.255) const]_[*@4 T]>_[* opera
-tor`~]()_[@(0.0.255) const]&]
+[s5;:Upp`:`:AMap`:`:operator`~`(`):%- [_^topic`:`/`/Core`/src`/MapKVRange`_en`-us`#Upp`:`:MapKVRange^ M
+apKVRange]<[_^topic`:`/`/Core`/src`/AMap`_en`-us`#AMap`:`:class^ AMap]<[*@4 K], 
+[*@4 T], [*@4 V]>, [*@4 K], [*@4 T]>_[* operator`~]()&]
+[s5;:Upp`:`:AMap`:`:operator`~`(`)const:%- [_^topic`:`/`/Core`/src`/MapKVRange`_en`-us`#Upp`:`:MapKVRange^ M
+apKVRange]<[_^topic`:`/`/Core`/src`/AMap`_en`-us`#AMap`:`:class^ AMap]<[@(0.0.255) co
+nst]_[*@4 K], [*@4 T], [*@4 V]>, [*@4 K], [@(0.0.255) const]_[*@4 T]>_[* operator`~]()_[@(0.0.255) c
+onst]&]
 [s2; Returns a special range object that can be used in C`+`+11 range 
 for to iterate over key/value pairs. Unlinked objects are automatically 
 skipped.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AMap`:`:operator`(`)`(const K`&`,const T`&`):%- [_^AMap^ AMap][@(0.0.255) `&]_[* opera
-tor()]([@(0.0.255) const]_[*@4 K][@(0.0.255) `&]_[*@3 k], [@(0.0.255) const]_[*@4 T][@(0.0.255) `&
-]_[*@3 v])&]
+[s5;:AMap`:`:operator`(`)`(const K`&`,const T`&`):%- [_^topic`:`/`/Core`/src`/AMap`_en`-us`#AMap`:`:class^ A
+Map][@(0.0.255) `&]_[* operator()]([@(0.0.255) const]_[*@4 K][@(0.0.255) `&]_[*@3 k], 
+[@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 v])&]
 [s2; Same as Add([%-*@3 k], [%-*@3 v]), returns `*this. Syntax sugar 
 for creating map.&]
 [s3; &]
diff --git a/uppsrc/Core/src.tpp/AMap_en-us.tppi b/uppsrc/Core/src.tpp/AMap_en-us.tppi
new file mode 100644
index 000000000..f478e211a
--- /dev/null
+++ b/uppsrc/Core/src.tpp/AMap_en-us.tppi
@@ -0,0 +1,24 @@
+TITLE("AMap")
+COMPRESSED
+120,156,237,93,123,115,211,72,18,255,42,83,197,238,86,194,58,137,228,71,236,36,44,5,11,44,71,5,184,20,9,220,31,41,19,43,246,216,214,69,150,124,26,57,143,91,150,207,126,221,51,163,209,91,26,219,114,8,123,108,177,96,91,243,232,199,111,122,186,123,30,58,183,219,237,222,145,213,236,28,93,29,255,243,224,168,73,126,250,201,108,24,143,90,93,179,213,235,180,204,118,115,31,254,50,91,102,179,211,108,181,205,94,243,160,221,107,181,122,198,225,208,177,24,235,159,59,205,94,143,87,106,66,165,102,183,211,52,187,237,94,187,103,182,186,189,38,212,109,26,70,211,232,54,59,102,187,213,107,118,14,71,148,13,251,231,6,20,111,65,241,131,253,214,129,97,26,70,215,52,141,86,179,107,180,58,109,211,108,53,161,137,102,183,105,26,157,67,234,142,250,231,255,216,63,194,10,109,168,96,116,246,13,195,216,135,214,218,109,3,90,199,106,237,150,217,50,154,173,142,121,208,217,63,188,164,19,219,237,159,103,89,234,84,178,212,53,14,237,128,206,36,71,86,251,232,
+241,179,206,145,9,85,247,27,251,143,186,208,109,187,3,157,29,32,71,45,168,214,108,238,119,14,204,78,27,72,106,27,205,67,159,254,103,97,251,116,70,221,64,182,96,155,102,211,60,186,52,187,71,64,194,215,175,95,119,205,182,33,36,213,5,90,76,3,232,110,154,240,27,240,209,53,59,7,198,65,167,103,246,140,86,183,221,236,116,129,245,185,229,91,51,201,201,101,187,121,36,249,232,53,122,143,246,205,125,144,168,209,3,250,59,7,208,128,1,76,192,191,32,200,14,252,105,245,14,3,89,25,235,97,165,131,198,193,35,16,82,171,99,116,15,140,110,187,219,105,3,39,77,115,223,4,65,26,200,63,168,225,208,245,252,153,229,244,207,177,130,129,178,174,248,239,240,37,29,91,11,7,216,253,243,226,175,159,95,189,223,249,120,74,206,201,159,127,154,248,240,217,22,40,114,183,221,220,53,182,201,57,51,142,200,249,227,103,221,163,54,121,254,206,154,247,251,127,253,245,75,255,156,181,142,8,254,99,30,97,215,116,124,248,243,14,57,127,182,101,236,26,187,192,215,118,
+139,128,50,230,142,21,208,254,121,139,92,60,233,39,158,73,240,193,131,62,180,220,62,106,145,99,252,214,32,85,197,206,244,138,125,210,43,246,15,139,77,255,112,147,165,158,246,37,87,200,235,224,112,32,6,74,138,59,217,214,197,249,99,33,18,172,210,227,82,106,3,39,59,95,206,238,230,148,120,99,114,69,239,216,46,57,38,179,5,11,200,212,186,166,100,68,233,156,12,189,249,29,252,229,178,192,95,12,3,207,111,144,75,74,206,247,62,143,230,216,227,222,96,239,212,91,248,67,250,210,27,14,246,94,120,110,96,217,46,245,217,96,239,157,119,77,173,75,135,126,38,51,249,169,79,44,119,20,107,222,155,83,223,130,22,7,191,13,126,131,190,198,80,113,180,27,167,238,44,70,221,181,229,44,40,208,119,38,26,96,86,96,179,241,29,137,141,5,70,198,158,143,148,10,18,200,216,177,174,225,7,123,4,207,236,177,77,71,228,242,142,112,180,210,0,30,127,74,116,245,41,214,213,165,197,236,33,241,129,88,111,70,172,225,144,50,22,53,155,168,37,117,178,243,5,63,
+216,238,68,136,122,151,188,139,137,144,179,69,22,46,179,39,248,33,100,122,107,123,139,11,149,28,15,126,33,183,219,4,136,154,122,35,224,39,88,248,46,54,53,133,38,5,215,156,47,234,8,38,121,255,134,128,179,193,199,122,219,220,63,226,154,37,54,35,150,32,129,4,83,43,0,162,103,151,208,59,35,111,220,17,189,13,117,76,110,236,96,90,206,100,36,240,6,118,62,67,122,102,208,129,16,41,48,248,38,192,206,22,12,24,178,24,182,69,101,191,82,5,67,224,131,198,171,52,64,96,228,19,69,0,33,6,249,215,231,190,111,221,225,55,142,11,248,225,148,78,228,243,221,20,123,169,175,111,237,43,10,149,238,136,23,76,129,218,247,103,111,35,218,27,74,22,231,143,247,62,7,222,220,30,10,156,190,128,145,63,216,99,254,112,132,80,13,225,57,248,137,186,131,157,5,139,193,20,234,17,210,15,16,13,92,84,165,237,192,207,87,131,139,168,21,252,206,249,241,230,129,237,185,150,19,141,162,62,9,64,222,108,12,20,51,58,179,0,149,67,144,139,229,128,226,23,
+147,41,168,140,130,24,199,212,2,4,128,206,44,31,4,8,93,17,123,54,247,252,0,138,19,219,133,198,124,251,26,164,174,100,108,115,213,134,138,137,217,58,129,145,208,72,254,177,101,54,123,219,175,249,223,207,204,208,78,146,23,209,184,38,47,41,8,208,73,89,204,78,100,91,248,191,91,131,109,110,94,164,45,217,218,198,66,205,163,120,67,187,209,23,224,194,37,96,90,131,59,94,92,146,7,245,241,67,59,252,144,233,67,12,12,254,249,151,65,195,118,131,84,167,9,227,134,101,35,227,22,127,52,248,5,127,127,214,34,12,241,22,123,0,45,246,67,194,255,153,81,83,220,216,113,138,1,112,31,132,153,97,96,126,2,175,196,56,18,252,83,221,98,23,133,255,2,232,218,249,34,172,103,36,158,118,129,220,5,206,196,72,30,60,57,30,52,132,237,25,60,69,17,201,135,159,224,115,142,164,64,231,248,255,54,17,197,250,23,188,145,184,64,158,244,229,108,208,72,216,181,120,145,167,74,154,238,232,54,148,103,166,101,105,75,115,181,0,6,69,73,253,108,106,115,91,
+49,67,75,19,147,14,216,32,31,6,0,8,154,15,98,52,216,208,50,154,159,164,9,59,255,121,39,36,133,15,54,77,107,182,75,126,7,139,17,61,97,177,217,136,193,188,64,220,197,236,82,84,8,237,109,216,21,82,175,139,223,80,29,220,220,161,178,86,81,146,168,157,171,165,135,164,23,65,166,82,204,102,149,17,27,60,146,225,157,47,199,232,182,168,223,37,63,59,95,62,137,62,150,53,136,39,139,75,7,136,127,39,102,227,183,54,216,22,101,16,115,212,61,26,13,162,105,124,208,16,31,207,34,13,115,39,38,43,117,2,21,11,204,88,70,193,74,79,87,41,43,22,175,146,215,9,84,185,21,138,5,138,63,206,35,124,230,16,142,36,111,142,232,188,22,115,104,44,32,110,35,84,149,201,229,152,11,99,89,101,230,117,183,57,221,73,26,151,208,91,53,125,154,106,42,38,167,14,58,66,75,4,133,209,155,5,163,194,109,138,112,132,231,150,237,227,4,12,174,146,152,49,97,98,70,127,25,75,66,88,71,125,234,194,92,42,11,72,163,1,206,170,180,56,232,19,
+186,30,196,14,115,58,228,1,65,131,216,220,143,29,137,232,50,50,120,50,14,129,137,255,141,11,85,237,17,55,125,16,178,115,215,157,97,15,207,249,132,84,93,44,156,215,83,133,20,181,188,212,85,104,195,74,75,113,211,123,157,177,107,121,243,208,31,224,22,230,14,163,148,23,132,106,145,101,87,29,68,77,244,142,2,223,166,215,72,37,200,125,238,49,27,61,32,52,220,99,219,135,238,165,38,132,55,141,69,148,6,184,126,193,173,69,186,27,16,79,224,140,98,145,185,79,33,116,153,47,64,15,177,48,8,98,63,108,61,247,153,152,58,32,48,229,173,227,228,97,9,98,98,69,120,72,116,227,45,156,81,88,16,28,58,84,59,208,41,28,30,14,149,25,252,100,15,118,144,48,207,71,119,27,72,146,192,185,244,189,43,234,138,40,22,61,115,104,17,184,116,105,14,131,72,130,232,150,222,194,36,194,34,38,241,177,227,221,80,160,87,73,202,70,85,11,25,142,56,17,49,252,146,145,71,69,247,188,165,168,33,139,184,116,2,97,240,181,154,41,69,51,48,30,176,149,
+143,174,99,187,87,32,37,229,201,96,68,1,65,40,80,62,74,78,164,114,26,69,140,65,180,154,122,56,133,135,39,249,10,81,229,246,228,56,20,191,99,133,24,6,66,62,192,75,136,145,44,71,100,244,88,202,88,178,87,237,106,33,108,19,248,230,31,203,64,190,10,194,47,178,85,106,5,253,15,200,165,32,247,173,160,244,158,222,6,131,45,30,107,86,2,9,203,38,193,36,159,2,99,246,106,152,113,161,201,2,157,242,41,144,169,135,96,196,146,104,10,155,169,11,74,208,129,62,140,38,60,44,240,69,99,17,77,216,108,28,97,100,139,121,162,233,176,38,35,19,164,233,142,176,197,37,131,232,26,9,24,90,142,195,103,186,80,200,2,63,64,51,27,82,119,132,188,112,166,182,119,201,191,166,192,10,38,127,40,47,227,122,130,39,5,60,206,139,76,14,242,1,87,3,120,43,230,219,132,67,29,230,251,54,99,150,146,206,100,216,151,124,60,253,129,192,7,138,192,186,140,167,157,111,22,53,141,104,86,209,209,212,161,103,43,223,90,44,88,21,237,88,247,27,33,62,
+142,118,199,250,225,151,102,199,150,24,75,165,110,194,3,112,17,30,186,87,154,30,30,27,27,20,43,217,249,37,144,191,105,220,241,16,250,129,34,239,149,236,237,193,56,168,128,246,107,93,7,21,203,214,236,160,130,125,187,182,189,5,251,30,92,132,44,152,208,105,216,132,139,128,130,14,93,4,220,111,242,0,188,212,154,188,132,124,125,47,235,41,220,83,14,170,188,215,76,38,183,86,2,150,78,236,218,174,29,20,37,83,243,168,143,231,120,235,166,124,181,148,175,162,242,88,151,52,157,164,111,101,63,203,233,177,238,124,188,150,218,114,210,242,107,18,89,170,161,136,166,239,43,33,85,79,50,10,87,8,92,122,163,10,110,193,12,43,87,107,185,96,176,89,48,99,12,158,53,226,185,125,177,192,153,40,201,247,145,220,216,140,230,173,5,108,135,211,25,197,109,29,99,145,135,71,1,248,114,241,193,14,88,108,130,171,54,209,247,181,96,160,246,219,36,87,13,74,108,182,160,93,186,25,105,248,94,123,54,143,184,36,135,37,14,134,68,164,40,167,229,21,40,161,225,190,
+72,194,2,235,78,193,133,92,46,184,199,36,37,136,211,49,110,253,193,65,36,119,83,97,11,58,83,31,202,100,193,59,170,150,196,201,34,88,118,14,129,42,223,116,81,55,77,114,133,21,90,153,220,213,38,13,78,157,190,33,23,212,221,219,162,106,156,58,45,185,213,179,156,10,131,68,88,59,233,33,34,176,23,25,251,161,76,30,218,89,143,151,159,9,155,57,119,172,161,24,18,25,131,190,23,45,153,238,70,157,112,43,158,233,66,184,205,201,74,124,55,225,104,4,133,194,245,84,105,253,196,78,28,145,19,129,89,108,151,124,10,23,87,195,237,109,184,223,145,63,206,223,1,197,243,37,126,204,245,100,188,242,52,220,204,6,157,40,206,246,36,13,156,141,28,131,151,51,83,61,4,19,171,107,86,42,86,204,87,27,162,213,16,215,234,86,115,161,62,14,173,60,248,70,232,21,139,237,165,160,149,211,106,106,37,95,173,222,71,113,80,18,208,48,44,178,144,230,78,77,136,225,212,12,158,194,48,239,54,181,133,96,232,249,224,59,204,61,17,209,229,184,5,17,238,21,
+89,127,15,128,202,205,246,90,129,91,84,188,86,160,42,18,42,34,140,68,247,154,128,61,181,103,182,99,241,125,36,80,189,193,221,11,133,48,205,173,32,223,155,86,121,174,34,207,244,20,37,144,214,50,60,37,189,234,198,112,247,228,75,85,5,117,75,186,84,107,81,174,25,233,149,16,170,17,142,235,155,246,202,126,150,83,229,125,135,227,75,56,116,203,16,121,255,225,120,121,56,169,27,44,207,23,65,34,88,110,228,249,102,24,26,251,222,140,243,17,174,122,129,96,74,98,221,7,96,243,74,98,184,215,116,25,103,11,74,215,178,7,46,103,43,162,142,198,191,217,78,160,216,162,68,44,9,83,1,187,15,177,164,181,90,228,140,226,20,149,78,17,62,159,227,77,236,33,161,190,239,249,100,203,98,140,250,136,53,158,51,191,92,76,128,159,17,221,78,70,240,87,218,251,131,62,20,59,109,154,137,234,52,76,114,151,87,170,76,210,170,240,209,89,139,177,196,3,60,2,20,65,75,196,129,63,160,245,61,65,43,62,101,222,39,202,150,158,93,71,107,0,83,192,227,111,
+11,79,57,225,198,87,237,98,235,185,225,206,244,70,158,100,228,108,16,49,159,9,108,161,9,22,80,107,164,137,216,23,92,85,242,176,11,62,190,164,177,166,198,113,218,198,222,66,31,235,188,112,124,49,155,45,230,115,71,81,172,133,251,229,78,113,136,10,53,196,28,217,158,245,15,114,172,76,68,125,121,200,28,242,181,206,120,172,67,250,106,249,220,144,82,173,140,146,34,111,181,200,35,217,215,10,10,189,183,60,114,138,210,229,116,87,91,78,185,194,66,255,109,189,210,55,227,106,187,156,93,54,148,43,129,183,164,15,150,110,149,245,191,148,199,111,7,15,33,23,84,110,157,151,203,67,139,10,245,88,231,170,132,80,253,68,212,58,186,203,50,66,27,33,125,101,235,172,159,239,87,228,173,108,157,203,210,66,107,119,91,191,254,150,180,206,53,175,248,125,151,254,243,189,217,231,116,166,138,219,231,114,243,108,187,177,51,161,5,121,171,239,205,70,159,210,0,92,126,177,19,163,81,146,181,87,155,50,68,133,226,77,25,197,163,104,217,245,153,4,105,5,57,231,101,200,
+210,92,183,249,32,22,14,25,71,78,108,83,71,241,174,18,157,69,145,192,47,154,7,47,6,143,195,228,112,224,215,148,25,156,123,192,59,229,107,79,106,152,63,184,221,89,181,29,23,124,255,241,237,91,197,242,170,219,88,245,211,53,39,25,225,250,41,18,214,220,129,157,194,138,70,6,103,109,12,45,153,133,201,195,151,238,52,242,3,99,15,0,99,120,18,68,203,38,201,130,53,173,210,230,117,187,20,188,215,32,167,38,136,63,160,115,45,203,156,167,218,36,198,171,38,64,81,155,207,229,185,135,249,138,22,76,85,189,13,28,228,75,109,29,181,28,39,117,92,34,171,85,225,240,165,15,224,13,118,228,233,188,172,140,112,123,105,116,0,137,111,0,137,137,45,127,131,41,187,143,99,126,69,70,41,182,105,117,189,19,112,239,179,247,91,133,27,167,116,55,7,167,224,178,17,144,172,128,130,250,244,172,171,132,122,133,251,134,133,244,151,29,242,186,244,60,135,75,55,42,190,210,57,175,51,138,182,234,102,74,249,253,137,149,158,52,191,236,49,206,74,238,78,235,18,209,
+64,168,150,62,0,167,47,154,211,27,74,163,155,7,115,131,12,44,17,93,70,248,129,226,93,142,2,54,217,221,180,124,139,3,242,57,76,220,233,89,74,2,12,208,72,61,85,186,137,21,6,154,74,167,55,30,154,134,194,225,209,43,12,227,252,93,192,26,16,114,113,245,179,32,100,44,204,111,136,90,27,137,27,43,8,211,207,20,109,128,198,250,146,74,69,220,105,101,151,54,195,217,106,57,195,4,35,90,137,67,13,234,87,75,41,230,144,82,43,90,238,45,227,152,199,72,93,192,168,239,8,2,239,75,92,214,90,238,64,23,206,16,13,81,67,184,58,225,130,74,159,228,103,236,74,175,109,139,165,254,170,252,87,97,231,171,78,43,137,82,213,167,149,194,89,35,238,145,151,156,88,226,87,101,242,27,151,25,4,178,145,3,209,32,148,23,135,201,231,14,103,88,55,188,134,121,36,68,132,198,157,81,203,31,78,211,78,199,55,77,70,234,156,157,242,185,132,170,39,162,184,94,26,235,41,39,123,113,175,120,50,244,22,110,144,81,157,4,158,120,24,139,137,2,117,218,
+175,255,237,37,173,1,104,97,234,80,114,143,87,17,96,104,176,210,146,195,104,29,132,192,156,66,177,186,25,145,230,220,136,203,29,40,17,71,159,217,51,30,128,43,36,67,152,12,176,103,142,61,153,6,240,97,68,231,212,29,49,248,85,140,109,213,152,128,82,204,187,249,63,31,79,170,56,115,146,89,38,11,47,73,15,115,28,209,189,4,170,118,35,231,118,162,212,53,185,249,161,73,212,63,209,30,208,2,151,225,189,198,8,204,167,165,201,255,18,112,230,92,111,12,237,69,183,25,51,103,73,40,158,202,176,91,148,222,98,30,110,4,28,92,56,54,11,26,36,254,109,247,53,13,94,160,133,216,218,222,126,64,56,225,138,63,229,116,198,46,85,206,209,120,177,253,77,249,30,66,18,111,198,131,173,147,172,142,212,27,47,200,147,196,207,119,48,96,65,146,125,114,242,52,171,83,162,116,250,102,220,223,58,17,247,45,207,51,138,74,134,235,83,143,133,39,251,196,91,27,108,202,207,101,143,236,33,244,31,90,230,185,198,237,218,162,125,221,4,132,42,189,214,218,77,30,
+71,89,223,72,93,4,85,183,13,203,75,68,232,78,195,234,253,26,231,131,126,89,82,161,114,211,105,188,161,85,175,149,145,238,94,241,110,36,189,229,188,101,19,15,47,214,236,111,89,1,151,59,245,154,130,204,72,237,239,32,172,208,234,22,230,79,194,113,27,22,212,203,157,76,115,47,237,143,175,185,228,243,250,124,24,44,44,167,232,142,249,138,84,221,43,124,165,69,117,34,72,22,44,101,36,153,137,227,41,32,48,32,252,157,25,209,156,22,205,88,132,191,44,199,208,72,181,37,154,106,144,177,229,128,25,86,187,231,171,185,124,225,128,65,42,205,186,241,18,249,89,183,156,9,186,58,205,55,245,249,221,19,101,121,62,94,36,234,242,157,237,218,51,251,191,120,32,19,58,247,197,81,166,197,108,30,250,90,226,250,8,116,67,241,245,5,124,153,128,39,254,172,185,53,180,131,59,21,114,174,0,130,15,20,98,102,157,224,147,23,43,26,236,183,129,111,197,198,59,47,203,20,125,217,205,230,138,114,80,108,226,226,203,225,194,247,197,237,84,162,64,35,81,212,118,57,
+255,209,89,126,213,96,106,193,32,244,23,63,164,59,212,219,242,237,56,222,80,103,124,243,130,218,227,59,205,27,215,44,186,197,101,166,44,183,108,21,3,184,14,83,54,83,198,151,171,136,44,191,230,132,200,151,109,98,97,65,20,168,42,111,2,38,141,169,53,103,34,180,90,48,58,94,56,194,137,152,89,87,33,164,233,173,53,12,196,113,62,137,123,240,57,118,39,187,225,222,42,104,131,129,239,139,61,48,152,128,172,9,173,138,69,95,250,222,188,10,221,88,166,136,127,23,226,205,223,64,2,45,98,42,132,99,121,150,154,65,114,172,119,114,187,109,184,177,75,39,170,169,214,242,153,23,123,137,81,209,60,125,230,133,171,9,217,154,171,185,80,162,69,29,64,20,220,126,144,183,202,45,53,173,123,170,163,180,49,45,201,113,215,91,67,4,121,126,53,17,245,53,165,80,236,39,202,221,95,117,8,163,160,41,141,203,129,148,40,20,142,142,57,143,39,33,143,25,192,231,209,154,216,160,152,34,104,4,53,231,81,130,164,132,173,227,168,146,218,72,32,43,103,247,173,107,
+168,217,183,103,85,227,30,203,20,143,251,104,62,27,45,134,52,237,163,225,5,79,220,65,155,129,0,64,17,225,171,156,192,224,169,143,106,61,221,1,143,66,206,112,248,14,188,255,160,203,6,117,34,127,168,202,138,189,142,237,85,92,17,183,175,43,118,48,214,131,231,251,246,232,113,201,188,218,37,163,62,196,172,224,96,13,182,78,3,240,32,102,21,91,61,101,233,190,44,157,27,92,179,232,34,142,176,60,83,203,177,241,193,17,120,123,220,123,20,109,237,146,127,121,254,149,156,4,193,189,197,119,254,197,94,65,56,183,124,94,243,227,201,73,152,136,201,121,103,27,147,61,202,84,165,140,198,18,239,158,140,242,49,248,70,72,203,159,208,96,143,137,119,180,49,65,72,181,212,110,240,37,96,252,91,169,184,110,248,203,191,46,114,223,45,56,216,227,245,47,196,107,5,7,143,194,182,249,91,22,63,151,188,235,46,90,213,193,246,133,36,67,201,202,92,131,23,133,26,91,210,112,240,61,43,152,251,209,25,80,226,29,116,21,243,192,26,239,152,35,97,31,107,207,21,60,
+139,138,175,226,75,188,61,110,165,241,146,109,65,39,5,119,98,15,175,148,184,184,164,138,212,45,74,41,125,139,175,145,194,133,60,158,228,138,240,41,159,121,194,158,226,1,153,144,80,146,116,242,18,34,78,223,187,203,188,202,173,68,44,154,204,39,141,46,171,116,21,138,100,33,19,204,74,24,242,123,36,13,241,67,63,23,94,5,128,66,130,214,198,83,242,101,119,43,225,40,167,9,93,32,133,50,45,197,145,174,236,66,40,41,240,72,1,165,164,145,34,119,21,240,232,114,28,67,15,63,207,92,141,31,228,32,239,165,134,68,53,81,172,241,174,158,198,117,223,101,184,28,87,202,107,172,164,62,3,206,173,27,223,14,240,53,181,219,171,19,27,211,162,220,25,151,212,163,46,32,115,25,10,241,84,196,66,93,68,230,131,237,247,117,245,149,98,83,101,108,191,86,142,60,168,113,252,233,131,229,78,104,52,250,100,107,209,163,207,36,250,12,99,112,245,201,63,53,21,156,133,31,62,245,159,170,173,33,234,217,211,68,242,249,107,20,219,150,114,27,141,189,135,194,114,161,
+219,94,33,133,194,72,61,43,24,157,9,66,174,229,32,204,38,16,76,95,254,27,44,156,216,223,59,132,64,5,194,22,238,149,66,136,243,98,240,235,224,87,211,148,5,241,221,216,252,232,25,118,7,245,48,180,73,222,185,201,98,187,88,69,179,98,67,183,181,8,188,25,56,173,67,190,128,196,174,108,140,238,150,88,159,0,101,150,158,185,173,211,7,141,189,225,252,62,206,234,94,71,254,174,76,150,63,31,141,194,35,221,188,61,249,254,222,254,118,67,197,218,131,199,193,212,6,97,159,222,129,101,184,37,108,49,177,124,241,234,114,204,169,202,183,157,87,121,194,48,97,226,27,227,241,35,122,206,16,68,100,214,88,197,207,253,139,99,148,139,44,175,18,255,226,33,218,164,99,222,247,130,47,147,170,133,89,8,107,156,137,7,198,126,58,211,152,94,160,113,238,115,188,145,139,215,58,84,229,174,251,230,57,238,199,13,233,106,38,125,171,195,195,126,162,79,201,100,226,183,144,91,76,82,132,11,235,188,51,45,150,126,167,19,219,77,152,162,116,251,178,79,94,112,89,247,
+46,162,39,126,31,66,252,156,136,134,131,119,21,99,76,139,167,87,238,72,135,163,87,174,222,230,225,18,126,144,180,127,139,68,202,157,231,142,162,52,212,166,89,196,248,13,202,167,179,46,5,156,202,210,69,9,150,185,199,150,76,177,228,201,161,100,35,95,104,55,98,72,194,117,182,95,101,14,30,220,42,234,210,177,29,136,36,155,141,107,77,252,229,208,252,206,98,220,90,246,152,211,200,15,230,112,59,63,156,210,225,85,250,18,170,212,225,14,59,190,200,146,77,241,212,165,12,53,128,80,254,113,185,135,3,38,45,69,183,96,84,200,155,138,42,65,35,239,196,213,38,80,142,134,52,121,2,253,250,42,22,228,173,1,246,101,233,78,66,60,77,190,14,164,171,37,47,152,210,67,238,198,96,187,22,106,151,149,106,214,222,103,12,70,141,150,94,23,211,106,236,93,175,6,238,98,102,106,48,242,37,200,223,56,127,5,118,62,195,230,198,45,252,26,35,229,247,220,81,194,212,48,73,140,134,194,65,179,222,48,41,87,0,151,186,113,68,250,253,255,1,195,39,224,207,
+
diff --git a/uppsrc/Core/src.tpp/Indext_en-us.tpp b/uppsrc/Core/src.tpp/Index_en-us.tpp
similarity index 100%
rename from uppsrc/Core/src.tpp/Indext_en-us.tpp
rename to uppsrc/Core/src.tpp/Index_en-us.tpp
diff --git a/uppsrc/Core/src.tpp/Index_en-us.tppi b/uppsrc/Core/src.tpp/Index_en-us.tppi
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppsrc/Core/src.tpp/MapKVRange_en-us.tpp b/uppsrc/Core/src.tpp/MapKVRange_en-us.tpp
new file mode 100644
index 000000000..b5fd6a113
--- /dev/null
+++ b/uppsrc/Core/src.tpp/MapKVRange_en-us.tpp
@@ -0,0 +1,55 @@
+topic "MapKVRange";
+[i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
+[l288;2 $$2,2#27521748481378242620020725143825:desc]
+[0 $$3,0#96390100711032703541132217272105:end]
+[H6;0 $$4,0#05600065144404261032431302351956:begin]
+[i448;a25;kKO9;2 $$5,0#37138531426314131252341829483370:item]
+[l288;a4;*@5;1 $$6,6#70004532496200323422659154056402:requirement]
+[l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param]
+[i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam]
+[b42;2 $$9,9#13035079074754324216151401829390:normal]
+[2 $$0,0#00000000000000000000000000000000:Default]
+[{_} 
+[ {{10000@(113.42.0) [s0;%% [*@7;4 MapKVRange]]}}&]
+[s3; &]
+[s1; [@(0.0.255)3 template][3  <][@(0.0.255)3 class][3  Map, ][@(0.0.255)3 class][3  
+K, ][@(0.0.255)3 class][3  V>]&]
+[s0;:Upp`:`:MapKVRange: [@(0.0.255) struct] [* MapKVRange]&]
+[s8;%% [*@4 Map]-|The class that is derivative of [^topic`:`/`/Core`/src`/AMap`_en`-us`#AMap`:`:class^ A
+Map] class.&]
+[s8;%% [*@4 K]-|Type of keys with exactly the same requirements as for 
+AMap container&]
+[s8;%% [*@4 T]-|Type of values with exactly the same requirements as 
+for AMap container.&]
+[s0; &]
+[s0; MapKVRange is a wrapper designed to provide a range`-based iteration 
+interface for custom AMap derivative containers. It allows to 
+iterate over key`-value pairs using standard C`+`+ syntax.&]
+[s3; &]
+[s0; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
+[s3; &]
+[s5;:Upp`:`:MapKVRange`:`:begin`(`)const: Upp[@(0.0.255) `::]MapKVRange[@(0.0.255) `::]Iter
+ator [* begin]() [@(0.0.255) const]&]
+[s2;%% Returns an iterator pointing to the first linked (valid) element 
+in the map. If the map is empty or all elements are unlinked, 
+this will return the same value as [^topic`:`/`/Core`/src`/MapKVRange`_en`-us`#Upp`:`:MapKVRange`:`:end`(`)const^ e
+nd()].&]
+[s3; &]
+[s4; &]
+[s5;:Upp`:`:MapKVRange`:`:end`(`)const: Upp[@(0.0.255) `::]MapKVRange[@(0.0.255) `::]Iterat
+or [* end]() [@(0.0.255) const]&]
+[s2;%% Returns an iterator representing the boundary past the last 
+element of the map. This serves as the sentinel value for the 
+end of the iteration.&]
+[s3; &]
+[s0; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s3; &]
+[s5;:Upp`:`:MapKVRange`:`:MapKVRange`(Map`&`): [* MapKVRange<Map, K, 
+V>](Map[@(0.0.255) `&] [*@3 map])&]
+[s2; Initializes a new range object tied to a specific map instance.&]
+[s2;%% [%-*@3 map] .the AMap based container to be iterated&]
+[s3;* &]
+[s0; &]
+[s0;%% ]]
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/MapKVRange_en-us.tppi b/uppsrc/Core/src.tpp/MapKVRange_en-us.tppi
new file mode 100644
index 000000000..99580d1c7
--- /dev/null
+++ b/uppsrc/Core/src.tpp/MapKVRange_en-us.tppi
@@ -0,0 +1,8 @@
+TITLE("MapKVRange")
+COMPRESSED
+120,156,165,85,105,111,219,70,16,253,43,3,40,54,36,71,150,247,20,175,160,112,225,162,173,225,6,45,2,55,95,8,58,92,81,43,123,107,138,100,185,148,28,213,181,127,123,103,73,157,105,220,180,169,32,144,92,238,206,155,121,111,14,198,70,8,63,82,76,70,247,87,63,7,17,131,87,175,232,144,244,184,71,185,47,57,21,108,140,23,202,41,147,140,11,234,179,64,248,156,251,36,204,114,101,109,18,231,204,247,91,35,54,100,61,230,73,70,61,225,11,159,114,207,103,104,203,8,97,196,99,146,10,238,51,25,78,181,205,146,152,224,113,142,62,130,49,15,8,37,196,163,148,112,230,17,46,5,165,156,33,4,243,24,37,50,212,197,52,137,127,28,71,206,64,160,1,145,99,66,200,24,209,132,32,136,238,204,4,167,156,48,46,105,32,199,225,68,223,154,34,137,255,78,73,126,145,146,71,66,211,232,249,154,145,18,209,201,185,140,40,154,142,135,227,158,135,110,133,68,103,129,99,196,209,140,177,177,12,168,20,24,146,32,44,172,245,239,11,83,235,185,46,154,53,130,
+161,148,209,104,66,189,8,67,120,126,126,30,81,65,58,165,60,140,133,18,140,155,81,124,135,60,60,42,3,18,72,159,250,132,123,130,73,15,169,87,170,86,243,53,147,137,96,209,154,135,63,244,123,99,58,70,69,137,143,241,203,0,1,8,146,192,59,10,41,241,207,253,176,89,27,59,59,103,20,12,131,30,138,196,37,241,2,226,9,79,10,100,194,232,152,162,144,196,241,199,52,132,69,89,207,85,158,196,206,128,56,173,191,240,11,191,211,51,181,200,145,238,227,135,39,136,225,241,145,186,215,231,125,76,225,72,176,17,25,64,108,73,116,116,4,241,201,185,23,9,120,171,170,171,247,239,84,113,171,147,228,233,233,56,137,45,143,192,221,104,4,241,121,159,140,200,8,9,13,56,96,22,170,92,53,58,137,57,192,155,228,96,111,93,117,184,129,112,67,120,105,243,234,229,173,247,223,36,206,41,137,194,95,171,42,13,211,112,23,87,184,31,7,216,166,94,100,77,130,225,239,135,238,108,253,53,171,150,83,114,250,231,245,157,238,28,64,115,167,26,48,22,166,186,54,75,
+213,152,165,134,114,6,241,77,83,86,38,67,103,103,233,217,69,89,235,244,204,214,89,122,246,45,154,167,31,116,145,158,46,108,218,107,87,24,79,139,116,3,110,153,116,176,163,67,167,87,206,229,170,106,161,239,245,202,194,131,105,238,64,127,84,89,147,175,48,4,13,86,205,53,236,149,164,5,101,97,86,214,45,40,100,101,209,40,83,232,250,16,246,122,15,118,169,242,133,254,122,224,81,167,48,172,111,59,249,156,54,10,30,106,85,85,186,70,149,172,185,45,244,20,154,18,170,186,92,154,169,198,221,218,29,76,79,39,202,226,14,182,100,141,58,150,5,152,2,31,103,42,211,173,191,108,97,155,114,222,185,221,19,123,27,129,29,193,101,3,42,207,203,7,235,224,59,28,228,182,68,191,40,90,122,218,82,132,74,153,218,194,194,154,226,22,19,174,138,169,170,167,112,145,190,78,95,131,93,33,214,199,209,94,161,118,140,54,149,254,125,159,50,127,240,67,123,61,167,187,98,135,95,22,147,220,100,240,86,55,119,229,20,126,50,182,249,164,224,229,103,106,207,173,218,233,
+149,246,211,1,210,176,77,8,120,104,191,32,211,48,76,118,6,159,238,92,182,12,81,26,140,160,27,131,253,193,65,61,183,160,109,253,50,23,232,59,221,44,234,2,211,81,172,197,65,211,170,68,149,157,20,168,152,75,247,12,197,105,32,55,197,61,166,162,143,138,153,233,0,116,222,166,30,19,210,158,153,171,10,181,158,109,158,93,134,177,127,155,21,32,30,234,191,57,142,142,106,13,139,162,3,27,226,113,227,234,11,15,212,109,32,187,242,234,18,131,117,245,82,219,236,137,182,109,158,207,234,137,159,143,173,154,55,128,171,254,32,217,207,167,248,231,116,236,155,255,143,100,184,143,216,127,79,69,173,171,90,91,189,78,7,106,51,41,23,174,58,87,88,178,152,19,247,38,119,15,155,108,148,179,93,54,174,157,182,86,215,75,221,246,103,171,108,139,164,243,181,186,174,133,220,107,140,109,99,185,237,180,175,168,248,11,199,199,77,203,210,53,53,118,96,254,47,43,126,111,213,119,227,239,56,29,132,135,3,247,77,59,231,113,158,227,220,118,71,14,148,62,118,211,249,156,
+59,214,201,160,147,19,46,11,211,24,172,212,63,28,121,40,244,67,55,80,160,156,252,166,51,20,206,116,243,70,129,173,116,102,102,216,168,109,213,22,174,251,51,61,218,38,37,62,58,221,64,195,200,9,212,206,154,110,42,109,199,140,67,154,108,180,211,211,142,241,9,28,140,63,196,74,146,191,0,115,191,213,9,
+
diff --git a/uppsrc/Core/src.tpp/all.i b/uppsrc/Core/src.tpp/all.i
new file mode 100644
index 000000000..52d5e2a82
--- /dev/null
+++ b/uppsrc/Core/src.tpp/all.i
@@ -0,0 +1,12 @@
+TOPIC("AMap_en-us")
+#include "AMap_en-us.tppi"
+END_TOPIC
+
+TOPIC("Index_en-us")
+#include "Index_en-us.tppi"
+END_TOPIC
+
+TOPIC("MapKVRange_en-us")
+#include "MapKVRange_en-us.tppi"
+END_TOPIC
+