diff --git a/documentation/app_class_diagram.mdj b/documentation/app_class_diagram.mdj
index 6e652b4..683b1e4 100644
--- a/documentation/app_class_diagram.mdj
+++ b/documentation/app_class_diagram.mdj
@@ -6405,8 +6405,8 @@
 											},
 											"visible": false,
 											"font": "Arial;13;0",
-											"left": -528,
-											"top": -48,
+											"left": -576,
+											"top": 128,
 											"height": 13
 										},
 										{
@@ -6416,8 +6416,8 @@
 												"$ref": "AAAAAAFpZvYIml/cwMw="
 											},
 											"font": "Arial;13;1",
-											"left": 1405,
-											"top": 1263,
+											"left": 1381,
+											"top": 1351,
 											"width": 255,
 											"height": 13,
 											"text": "WEBServerManager"
@@ -6430,8 +6430,8 @@
 											},
 											"visible": false,
 											"font": "Arial;13;0",
-											"left": -528,
-											"top": -48,
+											"left": -576,
+											"top": 128,
 											"width": 73.67724609375,
 											"height": 13,
 											"text": "(from Model)"
@@ -6444,15 +6444,15 @@
 											},
 											"visible": false,
 											"font": "Arial;13;0",
-											"left": -528,
-											"top": -48,
+											"left": -576,
+											"top": 128,
 											"height": 13,
 											"horizontalAlignment": 1
 										}
 									],
 									"font": "Arial;13;0",
-									"left": 1400,
-									"top": 1256,
+									"left": 1376,
+									"top": 1344,
 									"width": 265,
 									"height": 25,
 									"stereotypeLabel": {
@@ -6478,8 +6478,8 @@
 										"$ref": "AAAAAAFpZvYIml/ZPq4="
 									},
 									"font": "Arial;13;0",
-									"left": 1400,
-									"top": 1281,
+									"left": 1376,
+									"top": 1369,
 									"width": 265,
 									"height": 10
 								},
@@ -6493,8 +6493,8 @@
 										"$ref": "AAAAAAFpZvYIml/ZPq4="
 									},
 									"font": "Arial;13;0",
-									"left": 1400,
-									"top": 1291,
+									"left": 1376,
+									"top": 1379,
 									"width": 265,
 									"height": 10
 								},
@@ -6509,8 +6509,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": -264,
-									"top": -24,
+									"left": -288,
+									"top": 64,
 									"width": 10,
 									"height": 10
 								},
@@ -6525,16 +6525,16 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": -264,
-									"top": -24,
+									"left": -288,
+									"top": 64,
 									"width": 10,
 									"height": 10
 								}
 							],
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 1400,
-							"top": 1256,
+							"left": 1376,
+							"top": 1344,
 							"width": 265,
 							"height": 177,
 							"nameCompartment": {
@@ -8425,6 +8425,40 @@
 										"$ref": "AAAAAAFpizuATz4KOaE="
 									},
 									"subViews": [
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFpi2QRW75YLXw=",
+											"_parent": {
+												"$ref": "AAAAAAFpizuAUD4TikE="
+											},
+											"model": {
+												"$ref": "AAAAAAFpi2QRGr49cm4="
+											},
+											"font": "Arial;13;0",
+											"left": 2173,
+											"top": 922,
+											"width": 406.48486328125,
+											"height": 13,
+											"text": "+Dictionary<T>()",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFpjV5b6AKSH2Y=",
+											"_parent": {
+												"$ref": "AAAAAAFpizuAUD4TikE="
+											},
+											"model": {
+												"$ref": "AAAAAAFpjV5bqAJ3JIo="
+											},
+											"font": "Arial;13;0",
+											"left": 2173,
+											"top": 937,
+											"width": 406.48486328125,
+											"height": 13,
+											"text": "+Dictionary<T>(dictionaryToCopy: const Dictionary&)",
+											"horizontalAlignment": 0
+										},
 										{
 											"_type": "UMLOperationView",
 											"_id": "AAAAAAFpjWRFMCqhxoA=",
@@ -8436,7 +8470,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 922,
+											"top": 952,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "+~Dictionary()",
@@ -8453,10 +8487,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 937,
+											"top": 967,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+addParameter(parameter: const char *, value: T*): boolean",
+											"text": "+add(parameter: const char *, value: T*): boolean",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8470,10 +8504,44 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 952,
+											"top": 982,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+addParameter(parameter: const char *, value: T): boolean",
+											"text": "+add(parameter: const char *, value: T): boolean",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqIKn0HrJ3Nxw=",
+											"_parent": {
+												"$ref": "AAAAAAFpizuAUD4TikE="
+											},
+											"model": {
+												"$ref": "AAAAAAFqIKnz2rJcF4g="
+											},
+											"font": "Arial;13;0",
+											"left": 2173,
+											"top": 997,
+											"width": 406.48486328125,
+											"height": 13,
+											"text": "+add(indice: int, value: T*): boolean",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqIKkGAKwhQg0=",
+											"_parent": {
+												"$ref": "AAAAAAFpizuAUD4TikE="
+											},
+											"model": {
+												"$ref": "AAAAAAFqIKkFuqwG6tE="
+											},
+											"font": "Arial;13;0",
+											"left": 2173,
+											"top": 1012,
+											"width": 406.48486328125,
+											"height": 13,
+											"text": "+add(indice: int, value: T): boolean",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8487,10 +8555,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 967,
+											"top": 1027,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+deleteParameter(parameter: const char *): boolean",
+											"text": "+remove(parameter: const char *): boolean",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8504,10 +8572,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 982,
+											"top": 1042,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+get(parameter: const char *): Dictionary",
+											"text": "+get(parameter: const char *): T*",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8521,10 +8589,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 997,
+											"top": 1057,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+get(index: const unsigned int): Dictionary",
+											"text": "+get(index: const unsigned int): T*",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8538,10 +8606,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1012,
+											"top": 1072,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+operator()(parameter: const char*): Dictionary",
+											"text": "+operator()(parameter: const char*): T*",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8555,10 +8623,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1027,
+											"top": 1087,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+operator()(in index:const unsigned int): Dictionary()",
+											"text": "+operator()(index: const unsigned int): T*",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8572,7 +8640,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1042,
+											"top": 1102,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "+count(): unsigned int",
@@ -8589,7 +8657,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1057,
+											"top": 1117,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "+clear(): void",
@@ -8606,63 +8674,12 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1072,
+											"top": 1132,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "+dispose(): void",
 											"horizontalAlignment": 0
 										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjW8+emQ0POE=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjW8+QGQZGiA="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1087,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "+const longValue(): long",
-											"horizontalAlignment": 0
-										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjW+lSGT9nLk=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjW+lAGTiVLo="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1102,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "+const intValue(): int",
-											"horizontalAlignment": 0
-										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjW/WVWXGr+Q=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjW/WDGWrIS0="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1117,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "+const uintValue(): unsigned long",
-											"horizontalAlignment": 0
-										},
 										{
 											"_type": "UMLOperationView",
 											"_id": "AAAAAAFpjXBA1maPUc4=",
@@ -8674,61 +8691,10 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1132,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "+const stringValue(): const char*",
-											"horizontalAlignment": 0
-										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjXDN0GdYYuQ=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjXDNhWc9cpA="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
 											"top": 1147,
 											"width": 406.48486328125,
 											"height": 13,
-											"text": "+const doubleValue(): double",
-											"horizontalAlignment": 0
-										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjXEL72ghJXQ=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjXELomgGiF8="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1162,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "+const floatValue(): float",
-											"horizontalAlignment": 0
-										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjXE0Z2jqV94=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjXE0IWjPcdU="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1177,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "+const booleanValue(): boolean",
+											"text": "+const stringValue(): const char*",
 											"horizontalAlignment": 0
 										},
 										{
@@ -8742,29 +8708,12 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1192,
+											"top": 1162,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "+const getParameter(): const char *",
 											"horizontalAlignment": 0
 										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpi2QRW75YLXw=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpi2QRGr49cm4="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1207,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "#Dictionary<T>()",
-											"horizontalAlignment": 0
-										},
 										{
 											"_type": "UMLOperationView",
 											"_id": "AAAAAAFpjV0X7AFNt3k=",
@@ -8776,29 +8725,12 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1222,
+											"top": 1177,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "#Dictionary<T>(parameter: const char *, value: const char*)",
 											"horizontalAlignment": 0
 										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpjV5b6AKSH2Y=",
-											"_parent": {
-												"$ref": "AAAAAAFpizuAUD4TikE="
-											},
-											"model": {
-												"$ref": "AAAAAAFpjV5bqAJ3JIo="
-											},
-											"font": "Arial;13;0",
-											"left": 2173,
-											"top": 1237,
-											"width": 406.48486328125,
-											"height": 13,
-											"text": "#Dictionary<T>(dictionaryToCopy: const Dictionary&)",
-											"horizontalAlignment": 0
-										},
 										{
 											"_type": "UMLOperationView",
 											"_id": "AAAAAAFpjV/NtAPumGY=",
@@ -8810,7 +8742,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1252,
+											"top": 1192,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "#addNewNodeAtTheEnd(node: Dictionary*): boolean",
@@ -8827,7 +8759,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 2173,
-											"top": 1267,
+											"top": 1207,
 											"width": 406.48486328125,
 											"height": 13,
 											"text": "#isListEmpty(node: Dictionary): boolean",
@@ -8838,7 +8770,7 @@
 									"left": 2168,
 									"top": 917,
 									"width": 416.48486328125,
-									"height": 368
+									"height": 308
 								},
 								{
 									"_type": "UMLReceptionCompartmentView",
@@ -9124,6 +9056,40 @@
 											"text": "-type: Type",
 											"horizontalAlignment": 0
 										},
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFqIL0ErNt1FoY=",
+											"_parent": {
+												"$ref": "AAAAAAFpi0CGE0bLBnA="
+											},
+											"model": {
+												"$ref": "AAAAAAFqIL0EWdtaPjA="
+											},
+											"font": "Arial;13;0",
+											"left": 1709,
+											"top": 1452,
+											"width": 432.42138671875,
+											"height": 13,
+											"text": "-quotedParameter: boolean",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFqIL09M9yKOu4=",
+											"_parent": {
+												"$ref": "AAAAAAFpi0CGE0bLBnA="
+											},
+											"model": {
+												"$ref": "AAAAAAFqIL08ttxvd7s="
+											},
+											"font": "Arial;13;0",
+											"left": 1709,
+											"top": 1467,
+											"width": 432.42138671875,
+											"height": 13,
+											"text": "-quotedValue: boolean",
+											"horizontalAlignment": 0
+										},
 										{
 											"_type": "UMLAttributeView",
 											"_id": "AAAAAAFpsYaSQx3gWbU=",
@@ -9135,7 +9101,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 1709,
-											"top": 1452,
+											"top": 1482,
 											"width": 432.42138671875,
 											"height": 13,
 											"text": "-sdCardManager: SDCardManager&",
@@ -9146,7 +9112,7 @@
 									"left": 1704,
 									"top": 1417,
 									"width": 442.42138671875,
-									"height": 53
+									"height": 83
 								},
 								{
 									"_type": "UMLOperationCompartmentView",
@@ -9169,7 +9135,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 1709,
-											"top": 1475,
+											"top": 1505,
 											"width": 432.42138671875,
 											"height": 13,
 											"text": "+CFGFileParser(sdCardManager: SDCardManager&, file: const char*)",
@@ -9186,7 +9152,7 @@
 											},
 											"font": "Arial;13;0",
 											"left": 1709,
-											"top": 1490,
+											"top": 1520,
 											"width": 432.42138671875,
 											"height": 13,
 											"text": "+parseFile(): void *",
@@ -9203,35 +9169,18 @@
 											},
 											"font": "Arial;13;0",
 											"left": 1709,
-											"top": 1505,
+											"top": 1535,
 											"width": 432.42138671875,
 											"height": 13,
 											"text": "+save(data: void*): boolean",
 											"horizontalAlignment": 0
-										},
-										{
-											"_type": "UMLOperationView",
-											"_id": "AAAAAAFpsYJIPBPfkJ0=",
-											"_parent": {
-												"$ref": "AAAAAAFpi0CGE0bMdyM="
-											},
-											"model": {
-												"$ref": "AAAAAAFpsYJH8BPEwfM="
-											},
-											"font": "Arial;13;0",
-											"left": 1709,
-											"top": 1520,
-											"width": 432.42138671875,
-											"height": 13,
-											"text": "-addChar(pointer: char*, character: const char): char *",
-											"horizontalAlignment": 0
 										}
 									],
 									"font": "Arial;13;0",
 									"left": 1704,
-									"top": 1470,
+									"top": 1500,
 									"width": 442.42138671875,
-									"height": 68
+									"height": 53
 								},
 								{
 									"_type": "UMLReceptionCompartmentView",
@@ -9271,7 +9220,7 @@
 							"left": 1704,
 							"top": 1392,
 							"width": 442.42138671875,
-							"height": 146,
+							"height": 176,
 							"nameCompartment": {
 								"$ref": "AAAAAAFpi0CGE0bGKE4="
 							},
@@ -9309,8 +9258,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2168,
-									"top": 1440,
+									"left": 2167,
+									"top": 1447,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -9330,8 +9279,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 2168,
-									"top": 1425,
+									"left": 2166,
+									"top": 1432,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -9352,7 +9301,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 2168,
-									"top": 1470,
+									"top": 1476,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -9370,7 +9319,7 @@
 								"$ref": "AAAAAAFpi0CGE0bF2oM="
 							},
 							"lineStyle": 1,
-							"points": "2146:1462;2191:1461",
+							"points": "2146:1469;2191:1467",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpi0afQXP9ZsA="
@@ -9668,7 +9617,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1893,
+									"left": 1892,
 									"top": 1307,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -9689,8 +9638,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 1878,
-									"top": 1309,
+									"left": 1877,
+									"top": 1308,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -9710,7 +9659,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1922,
+									"left": 1921,
 									"top": 1304,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -9729,7 +9678,7 @@
 								"$ref": "AAAAAAFpi0CGE0bF2oM="
 							},
 							"lineStyle": 1,
-							"points": "1917:1391;1900:1233",
+							"points": "1915:1391;1900:1233",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpsXnbAcOkVRI="
@@ -10025,13 +9974,30 @@
 											"height": 13,
 											"text": "SEPARATION",
 											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLEnumerationLiteralView",
+											"_id": "AAAAAAFqILyyqNnK6oY=",
+											"_parent": {
+												"$ref": "AAAAAAFpsX8qmvfYSIA="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILyyUdmvZ+w="
+											},
+											"font": "Arial;13;0",
+											"left": 1733,
+											"top": 1780,
+											"width": 132.1708984375,
+											"height": 13,
+											"text": "DONE",
+											"horizontalAlignment": 0
 										}
 									],
 									"font": "Arial;13;0",
 									"left": 1728,
 									"top": 1670,
 									"width": 142.1708984375,
-									"height": 113
+									"height": 128
 								}
 							],
 							"font": "Arial;13;0",
@@ -10039,7 +10005,7 @@
 							"left": 1728,
 							"top": 1632,
 							"width": 142.1708984375,
-							"height": 151,
+							"height": 166,
 							"nameCompartment": {
 								"$ref": "AAAAAAFpsX8qmvfPC7c="
 							},
@@ -10317,8 +10283,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1874,
-									"top": 1584,
+									"left": 1872,
+									"top": 1599,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -10338,8 +10304,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 1887,
-									"top": 1591,
+									"left": 1885,
+									"top": 1606,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -10359,8 +10325,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1847,
-									"top": 1571,
+									"left": 1845,
+									"top": 1586,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -10378,7 +10344,7 @@
 								"$ref": "AAAAAAFpi0CGE0bF2oM="
 							},
 							"lineStyle": 1,
-							"points": "1886:1538;1837:1631",
+							"points": "1876:1568;1843:1631",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpsX9oh/oMkW0="
@@ -10411,8 +10377,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1755,
-									"top": 1594,
+									"left": 1742,
+									"top": 1609,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -10432,8 +10398,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 1764,
-									"top": 1606,
+									"left": 1750,
+									"top": 1621,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -10453,8 +10419,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1738,
-									"top": 1569,
+									"left": 1725,
+									"top": 1584,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -10472,7 +10438,7 @@
 								"$ref": "AAAAAAFpi0CGE0bF2oM="
 							},
 							"lineStyle": 1,
-							"points": "1819:1538;1676:1639",
+							"points": "1788:1568;1680:1639",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpsX943PqVJqU="
@@ -10566,7 +10532,7 @@
 								"$ref": "AAAAAAFpaNsPGoJQWWc="
 							},
 							"lineStyle": 1,
-							"points": "2010:1075;2088:1144;2080:1296;1992:1391",
+							"points": "2010:1075;2088:1144;2080:1296;1999:1391",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpzh1zA1xrcjc="
@@ -10985,6 +10951,40 @@
 											"text": "+const getParameter(): const char*",
 											"horizontalAlignment": 0
 										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqIKKVYIlZDEA=",
+											"_parent": {
+												"$ref": "AAAAAAFpzh97jmHcaZ8="
+											},
+											"model": {
+												"$ref": "AAAAAAFqIKKVAYk+EmM="
+											},
+											"font": "Arial;13;0",
+											"left": 1949,
+											"top": 2037,
+											"width": 672.65478515625,
+											"height": 13,
+											"text": "+const isQuotedParameter(): const bool",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqIKO2rYvZyOE=",
+											"_parent": {
+												"$ref": "AAAAAAFpzh97jmHcaZ8="
+											},
+											"model": {
+												"$ref": "AAAAAAFqIKO2NYu+nHQ="
+											},
+											"font": "Arial;13;0",
+											"left": 1949,
+											"top": 2052,
+											"width": 672.65478515625,
+											"height": 13,
+											"text": "+const isQuotedValue(): const bool",
+											"horizontalAlignment": 0
+										},
 										{
 											"_type": "UMLOperationView",
 											"_id": "AAAAAAFpzik325xGTh0=",
@@ -10996,7 +10996,7 @@
 											},
 											"font": "Arial;13;2",
 											"left": 1949,
-											"top": 2037,
+											"top": 2067,
 											"width": 672.65478515625,
 											"height": 13,
 											"text": "+toString(): const char*",
@@ -11007,7 +11007,7 @@
 									"left": 1944,
 									"top": 1837,
 									"width": 682.65478515625,
-									"height": 218
+									"height": 248
 								},
 								{
 									"_type": "UMLReceptionCompartmentView",
@@ -11047,7 +11047,7 @@
 							"left": 1944,
 							"top": 1744,
 							"width": 682.65478515625,
-							"height": 311,
+							"height": 341,
 							"nameCompartment": {
 								"$ref": "AAAAAAFpzh97jmHWM+M="
 							},
@@ -11086,7 +11086,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 2081,
-									"top": 1624,
+									"top": 1639,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -11107,7 +11107,7 @@
 									"visible": null,
 									"font": "Arial;13;0",
 									"left": 2093,
-									"top": 1614,
+									"top": 1630,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -11128,7 +11128,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 2058,
-									"top": 1643,
+									"top": 1658,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -11146,7 +11146,7 @@
 								"$ref": "AAAAAAFpi0CGE0bF2oM="
 							},
 							"lineStyle": 1,
-							"points": "1985:1538;2155:1743",
+							"points": "1998:1568;2142:1743",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpzh/tgmkJvhc="
@@ -11186,8 +11186,8 @@
 											},
 											"visible": false,
 											"font": "Arial;13;0",
-											"left": -1488,
-											"top": -512,
+											"left": -1264,
+											"top": -560,
 											"width": 64.32080078125,
 											"height": 13,
 											"text": "«interface»"
@@ -11199,8 +11199,8 @@
 												"$ref": "AAAAAAFpzisDZqBw908="
 											},
 											"font": "Arial;13;1",
-											"left": 2117,
-											"top": 1590,
+											"left": 2229,
+											"top": 1566,
 											"width": 321.15966796875,
 											"height": 13,
 											"text": "DictionaryInterface"
@@ -11213,8 +11213,8 @@
 											},
 											"visible": false,
 											"font": "Arial;13;0",
-											"left": -1488,
-											"top": -512,
+											"left": -1264,
+											"top": -560,
 											"width": 73.67724609375,
 											"height": 13,
 											"text": "(from Model)"
@@ -11227,15 +11227,15 @@
 											},
 											"visible": false,
 											"font": "Arial;13;0",
-											"left": -1488,
-											"top": -512,
+											"left": -1264,
+											"top": -560,
 											"height": 13,
 											"horizontalAlignment": 1
 										}
 									],
 									"font": "Arial;13;0",
-									"left": 2112,
-									"top": 1583,
+									"left": 2224,
+									"top": 1559,
 									"width": 331.15966796875,
 									"height": 25,
 									"stereotypeLabel": {
@@ -11262,8 +11262,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": -744,
-									"top": -256,
+									"left": -632,
+									"top": -280,
 									"width": 10,
 									"height": 10
 								},
@@ -11287,8 +11287,8 @@
 												"$ref": "AAAAAAFpziyp+aQiFXI="
 											},
 											"font": "Arial;13;0",
-											"left": 2117,
-											"top": 1613,
+											"left": 2229,
+											"top": 1589,
 											"width": 321.15966796875,
 											"height": 13,
 											"text": "+DictionaryInterface()",
@@ -11304,8 +11304,8 @@
 												"$ref": "AAAAAAFpzi1wSrBZb8E="
 											},
 											"font": "Arial;13;0",
-											"left": 2117,
-											"top": 1628,
+											"left": 2229,
+											"top": 1604,
 											"width": 321.15966796875,
 											"height": 13,
 											"text": "+DictionaryInterface(Object: const DictionaryInterface&)",
@@ -11321,8 +11321,8 @@
 												"$ref": "AAAAAAFpzi5ZdLIs7T0="
 											},
 											"font": "Arial;13;2",
-											"left": 2117,
-											"top": 1643,
+											"left": 2229,
+											"top": 1619,
 											"width": 321.15966796875,
 											"height": 13,
 											"text": "+~DictionaryInterface()",
@@ -11338,8 +11338,8 @@
 												"$ref": "AAAAAAFpzi6jqbQV338="
 											},
 											"font": "Arial;13;2",
-											"left": 2117,
-											"top": 1658,
+											"left": 2229,
+											"top": 1634,
 											"width": 321.15966796875,
 											"height": 13,
 											"text": "+toString(): const char *",
@@ -11347,8 +11347,8 @@
 										}
 									],
 									"font": "Arial;13;0",
-									"left": 2112,
-									"top": 1608,
+									"left": 2224,
+									"top": 1584,
 									"width": 331.15966796875,
 									"height": 68
 								},
@@ -11363,8 +11363,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": -744,
-									"top": -256,
+									"left": -632,
+									"top": -280,
 									"width": 10,
 									"height": 10
 								},
@@ -11379,16 +11379,16 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": -744,
-									"top": -256,
+									"left": -632,
+									"top": -280,
 									"width": 10,
 									"height": 10
 								}
 							],
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 2112,
-							"top": 1560,
+							"left": 2224,
+							"top": 1536,
 							"width": 331.15966796875,
 							"height": 117,
 							"stereotypeDisplay": "icon",
@@ -11430,8 +11430,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2293,
-									"top": 1703,
+									"left": 2369,
+									"top": 1696,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -11451,8 +11451,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 2308,
-									"top": 1703,
+									"left": 2383,
+									"top": 1701,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -11472,8 +11472,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2264,
-									"top": 1704,
+									"left": 2340,
+									"top": 1687,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -11493,8 +11493,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2293,
-									"top": 1696,
+									"left": 2376,
+									"top": 1676,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -11514,8 +11514,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2307,
-									"top": 1698,
+									"left": 2387,
+									"top": 1682,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -11535,8 +11535,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2266,
-									"top": 1693,
+									"left": 2351,
+									"top": 1663,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -11556,8 +11556,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2294,
-									"top": 1710,
+									"left": 2362,
+									"top": 1717,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 30,
@@ -11576,8 +11576,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2307,
-									"top": 1707,
+									"left": 2375,
+									"top": 1719,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -11596,8 +11596,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 2266,
-									"top": 1715,
+									"left": 2334,
+									"top": 1712,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -11642,7 +11642,7 @@
 								"$ref": "AAAAAAFpzisDZqBvMF0="
 							},
 							"lineStyle": 1,
-							"points": "2278:1677;2280:1743",
+							"points": "2370:1653;2340:1743",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpzi+OYr4Mg/w="
@@ -11698,17 +11698,17 @@
 										"$ref": "AAAAAAFpzkUGDdUHakc="
 									},
 									"font": "Arial;13;0",
-									"left": 1346,
-									"top": 1231,
+									"left": 1486,
+									"top": 1320,
 									"width": 120.42138671875,
 									"height": 13,
-									"alpha": -0.40138557260474883,
-									"distance": 96.54014708917737,
+									"alpha": 0.4449382957141438,
+									"distance": 170.4494059831245,
 									"hostEdge": {
 										"$ref": "AAAAAAFpzkUGDdULD3k="
 									},
 									"edgePosition": 1,
-									"text": "-WebServeManagerr"
+									"text": "-WebServeManager"
 								},
 								{
 									"_type": "EdgeLabelView",
@@ -11721,8 +11721,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 1407,
-									"top": 1120,
+									"left": 1452,
+									"top": 1191,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -11742,8 +11742,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1370,
-									"top": 1146,
+									"left": 1409,
+									"top": 1207,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -11763,8 +11763,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1328,
-									"top": 1038,
+									"left": 1325,
+									"top": 1039,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -11784,8 +11784,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1340,
-									"top": 1032,
+									"left": 1337,
+									"top": 1033,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -11805,7 +11805,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1303,
+									"left": 1300,
 									"top": 1051,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -11826,8 +11826,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1462,
-									"top": 1219,
+									"left": 1479,
+									"top": 1307,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 30,
@@ -11846,8 +11846,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1471,
-									"top": 1209,
+									"left": 1491,
+									"top": 1300,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -11866,8 +11866,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1443,
-									"top": 1239,
+									"left": 1455,
+									"top": 1321,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -11912,7 +11912,7 @@
 								"$ref": "AAAAAAFpHqCuVb5uVUA="
 							},
 							"lineStyle": 1,
-							"points": "1301:1033;1466:1255",
+							"points": "1298:1033;1424:1208;1475:1343",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFpzkUGDtUMV9w="
@@ -11947,6 +11947,288 @@
 							"headQualifiersCompartment": {
 								"$ref": "AAAAAAFpzkUGDtUWL2g="
 							}
+						},
+						{
+							"_type": "UMLClassView",
+							"_id": "AAAAAAFqILBGHMl9hEU=",
+							"_parent": {
+								"$ref": "AAAAAAFF+qBtyKM79qY="
+							},
+							"model": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"subViews": [
+								{
+									"_type": "UMLNameCompartmentView",
+									"_id": "AAAAAAFqILBGHcl+SBE=",
+									"_parent": {
+										"$ref": "AAAAAAFqILBGHMl9hEU="
+									},
+									"model": {
+										"$ref": "AAAAAAFqILBGHMl7EOQ="
+									},
+									"subViews": [
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFqILBGHcl/e9w=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcl+SBE="
+											},
+											"visible": false,
+											"font": "Arial;13;0",
+											"left": -208,
+											"top": -160,
+											"height": 13
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFqILBGHcmAVvM=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcl+SBE="
+											},
+											"font": "Arial;13;1",
+											"left": 2349,
+											"top": 623,
+											"width": 359,
+											"height": 13,
+											"text": "StringEntity"
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFqILBGHcmBtsA=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcl+SBE="
+											},
+											"visible": false,
+											"font": "Arial;13;0",
+											"left": -208,
+											"top": -160,
+											"width": 73.67724609375,
+											"height": 13,
+											"text": "(from Model)"
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFqILBGHcmCtd8=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcl+SBE="
+											},
+											"visible": false,
+											"font": "Arial;13;0",
+											"left": -208,
+											"top": -160,
+											"height": 13,
+											"horizontalAlignment": 1
+										}
+									],
+									"font": "Arial;13;0",
+									"left": 2344,
+									"top": 616,
+									"width": 369,
+									"height": 25,
+									"stereotypeLabel": {
+										"$ref": "AAAAAAFqILBGHcl/e9w="
+									},
+									"nameLabel": {
+										"$ref": "AAAAAAFqILBGHcmAVvM="
+									},
+									"namespaceLabel": {
+										"$ref": "AAAAAAFqILBGHcmBtsA="
+									},
+									"propertyLabel": {
+										"$ref": "AAAAAAFqILBGHcmCtd8="
+									}
+								},
+								{
+									"_type": "UMLAttributeCompartmentView",
+									"_id": "AAAAAAFqILBGHcmDum4=",
+									"_parent": {
+										"$ref": "AAAAAAFqILBGHMl9hEU="
+									},
+									"model": {
+										"$ref": "AAAAAAFqILBGHMl7EOQ="
+									},
+									"subViews": [
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFqILuHkNUZMn4=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcmDum4="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILuHJdT479Q="
+											},
+											"font": "Arial;13;0",
+											"left": 2349,
+											"top": 646,
+											"width": 359,
+											"height": 13,
+											"text": "+string: char *",
+											"horizontalAlignment": 0
+										}
+									],
+									"font": "Arial;13;0",
+									"left": 2344,
+									"top": 641,
+									"width": 369,
+									"height": 23
+								},
+								{
+									"_type": "UMLOperationCompartmentView",
+									"_id": "AAAAAAFqILBGHcmETTo=",
+									"_parent": {
+										"$ref": "AAAAAAFqILBGHMl9hEU="
+									},
+									"model": {
+										"$ref": "AAAAAAFqILBGHMl7EOQ="
+									},
+									"subViews": [
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqILCWTMvkwWs=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcmETTo="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILCV/cvDnpc="
+											},
+											"font": "Arial;13;0",
+											"left": 2349,
+											"top": 669,
+											"width": 359,
+											"height": 13,
+											"text": "+StringEntity(string: const char *)",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqILEo2s2RMzo=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcmETTo="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILEoks1w0xw="
+											},
+											"font": "Arial;13;0",
+											"left": 2349,
+											"top": 684,
+											"width": 359,
+											"height": 13,
+											"text": "+StringEntity(Object: const StringEntity&)",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqILGjcc7k0kA=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcmETTo="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILGjIs7DhXw="
+											},
+											"font": "Arial;13;0",
+											"left": 2349,
+											"top": 699,
+											"width": 359,
+											"height": 13,
+											"text": "+~StringEntity()",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqILIYkdFibrA=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcmETTo="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILIYSNFBqbs="
+											},
+											"font": "Arial;13;0",
+											"left": 2349,
+											"top": 714,
+											"width": 359,
+											"height": 13,
+											"text": "+getString(): char *",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLOperationView",
+											"_id": "AAAAAAFqILJwNtMPFqE=",
+											"_parent": {
+												"$ref": "AAAAAAFqILBGHcmETTo="
+											},
+											"model": {
+												"$ref": "AAAAAAFqILJv6NLu0DE="
+											},
+											"font": "Arial;13;0",
+											"left": 2349,
+											"top": 729,
+											"width": 359,
+											"height": 13,
+											"text": "+split(character: char): Dictionary<StringEntity>*",
+											"horizontalAlignment": 0
+										}
+									],
+									"font": "Arial;13;0",
+									"left": 2344,
+									"top": 664,
+									"width": 369,
+									"height": 83
+								},
+								{
+									"_type": "UMLReceptionCompartmentView",
+									"_id": "AAAAAAFqILBGHcmFYEo=",
+									"_parent": {
+										"$ref": "AAAAAAFqILBGHMl9hEU="
+									},
+									"model": {
+										"$ref": "AAAAAAFqILBGHMl7EOQ="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": -104,
+									"top": -80,
+									"width": 10,
+									"height": 10
+								},
+								{
+									"_type": "UMLTemplateParameterCompartmentView",
+									"_id": "AAAAAAFqILBGHcmGj0s=",
+									"_parent": {
+										"$ref": "AAAAAAFqILBGHMl9hEU="
+									},
+									"model": {
+										"$ref": "AAAAAAFqILBGHMl7EOQ="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": -104,
+									"top": -80,
+									"width": 10,
+									"height": 10
+								}
+							],
+							"font": "Arial;13;0",
+							"containerChangeable": true,
+							"left": 2344,
+							"top": 616,
+							"width": 369,
+							"height": 131,
+							"nameCompartment": {
+								"$ref": "AAAAAAFqILBGHcl+SBE="
+							},
+							"attributeCompartment": {
+								"$ref": "AAAAAAFqILBGHcmDum4="
+							},
+							"operationCompartment": {
+								"$ref": "AAAAAAFqILBGHcmETTo="
+							},
+							"receptionCompartment": {
+								"$ref": "AAAAAAFqILBGHcmFYEo="
+							},
+							"templateParameterCompartment": {
+								"$ref": "AAAAAAFqILBGHcmGj0s="
+							}
 						}
 					]
 				},
@@ -12260,7 +12542,7 @@
 							"_parent": {
 								"$ref": "AAAAAAFpHqCuU75sfJc="
 							},
-							"name": "WebServeManagerr",
+							"name": "WebServeManager",
 							"end1": {
 								"_type": "UMLAssociationEnd",
 								"_id": "AAAAAAFpzkUGDdUIn7w=",
@@ -14775,6 +15057,33 @@
 						}
 					],
 					"operations": [
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFpi2QRGr49cm4=",
+							"_parent": {
+								"$ref": "AAAAAAFpizuATz4KOaE="
+							},
+							"name": "Dictionary<T>"
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFpjV5bqAJ3JIo=",
+							"_parent": {
+								"$ref": "AAAAAAFpizuATz4KOaE="
+							},
+							"name": "Dictionary<T>",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFpjV/MzAOJlf0=",
+									"_parent": {
+										"$ref": "AAAAAAFpjV5bqAJ3JIo="
+									},
+									"name": "dictionaryToCopy",
+									"type": "const Dictionary&"
+								}
+							]
+						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFpjWRE9SqG7OI=",
@@ -14789,7 +15098,7 @@
 							"_parent": {
 								"$ref": "AAAAAAFpizuATz4KOaE="
 							},
-							"name": "addParameter",
+							"name": "add",
 							"parameters": [
 								{
 									"_type": "UMLParameter",
@@ -14826,7 +15135,7 @@
 							"_parent": {
 								"$ref": "AAAAAAFpizuATz4KOaE="
 							},
-							"name": "addParameter",
+							"name": "add",
 							"parameters": [
 								{
 									"_type": "UMLParameter",
@@ -14857,13 +15166,87 @@
 								}
 							]
 						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqIKnz2rJcF4g=",
+							"_parent": {
+								"$ref": "AAAAAAFpizuATz4KOaE="
+							},
+							"name": "add",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKpCmrhTEgY=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKnz2rJcF4g="
+									},
+									"name": "indice",
+									"type": "int"
+								},
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKpCm7hUf5M=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKnz2rJcF4g="
+									},
+									"name": "value",
+									"type": "T*"
+								},
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKpCnLhVxIs=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKnz2rJcF4g="
+									},
+									"type": "boolean",
+									"direction": "return"
+								}
+							]
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqIKkFuqwG6tE=",
+							"_parent": {
+								"$ref": "AAAAAAFpizuATz4KOaE="
+							},
+							"name": "add",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKlqt6yjw9E=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKkFuqwG6tE="
+									},
+									"name": "indice",
+									"type": "int"
+								},
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKlquaykwAo=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKkFuqwG6tE="
+									},
+									"name": "value",
+									"type": "T"
+								},
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKlqvKylyuE=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKkFuqwG6tE="
+									},
+									"type": "boolean",
+									"direction": "return"
+								}
+							]
+						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFpjWf+WzHQnSs=",
 							"_parent": {
 								"$ref": "AAAAAAFpizuATz4KOaE="
 							},
-							"name": "deleteParameter",
+							"name": "remove",
 							"parameters": [
 								{
 									"_type": "UMLParameter",
@@ -14908,9 +15291,7 @@
 									"_parent": {
 										"$ref": "AAAAAAFpi2M/z7SZ61E="
 									},
-									"type": {
-										"$ref": "AAAAAAFpizuATz4KOaE="
-									},
+									"type": "T*",
 									"direction": "return"
 								}
 							]
@@ -14938,9 +15319,7 @@
 									"_parent": {
 										"$ref": "AAAAAAFprvtR0d/MFek="
 									},
-									"type": {
-										"$ref": "AAAAAAFpizuATz4KOaE="
-									},
+									"type": "T*",
 									"direction": "return"
 								}
 							]
@@ -14968,9 +15347,7 @@
 									"_parent": {
 										"$ref": "AAAAAAFpjWl5mUIJoA4="
 									},
-									"type": {
-										"$ref": "AAAAAAFpizuATz4KOaE="
-									},
+									"type": "T*",
 									"direction": "return"
 								}
 							]
@@ -14981,7 +15358,27 @@
 							"_parent": {
 								"$ref": "AAAAAAFpizuATz4KOaE="
 							},
-							"name": "operator()(in index:const unsigned int): Dictionary"
+							"name": "operator()",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIK1iDb6Vv3s=",
+									"_parent": {
+										"$ref": "AAAAAAFprvmEftbrBQI="
+									},
+									"name": "index",
+									"type": "const unsigned int"
+								},
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIK1iDb6WwsY=",
+									"_parent": {
+										"$ref": "AAAAAAFprvmEftbrBQI="
+									},
+									"type": "T*",
+									"direction": "return"
+								}
+							]
 						},
 						{
 							"_type": "UMLOperation",
@@ -15040,63 +15437,6 @@
 								}
 							]
 						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjW8+QGQZGiA=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "const longValue",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjW+kRWSYthM=",
-									"_parent": {
-										"$ref": "AAAAAAFpjW8+QGQZGiA="
-									},
-									"type": "long",
-									"direction": "return"
-								}
-							]
-						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjW+lAGTiVLo=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "const intValue",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjW/VV2VhBYI=",
-									"_parent": {
-										"$ref": "AAAAAAFpjW+lAGTiVLo="
-									},
-									"type": "int",
-									"direction": "return"
-								}
-							]
-						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjW/WDGWrIS0=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "const uintValue",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjXA/1mYqP+c=",
-									"_parent": {
-										"$ref": "AAAAAAFpjW/WDGWrIS0="
-									},
-									"type": "unsigned long",
-									"direction": "return"
-								}
-							]
-						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFpjXBAiWZ08yw=",
@@ -15116,63 +15456,6 @@
 								}
 							]
 						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjXDNhWc9cpA=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "const doubleValue",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjXEK7me8lp4=",
-									"_parent": {
-										"$ref": "AAAAAAFpjXDNhWc9cpA="
-									},
-									"type": "double",
-									"direction": "return"
-								}
-							]
-						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjXELomgGiF8=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "const floatValue",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjXEzaGiFktE=",
-									"_parent": {
-										"$ref": "AAAAAAFpjXELomgGiF8="
-									},
-									"type": "float",
-									"direction": "return"
-								}
-							]
-						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjXE0IWjPcdU=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "const booleanValue",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjXGKs2lOXfI=",
-									"_parent": {
-										"$ref": "AAAAAAFpjXE0IWjPcdU="
-									},
-									"type": "boolean",
-									"direction": "return"
-								}
-							]
-						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFprwVybuXqPaM=",
@@ -15192,15 +15475,6 @@
 								}
 							]
 						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpi2QRGr49cm4=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "Dictionary<T>",
-							"visibility": "protected"
-						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFpjV0XsgEy+dc=",
@@ -15230,26 +15504,6 @@
 								}
 							]
 						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpjV5bqAJ3JIo=",
-							"_parent": {
-								"$ref": "AAAAAAFpizuATz4KOaE="
-							},
-							"name": "Dictionary<T>",
-							"visibility": "protected",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpjV/MzAOJlf0=",
-									"_parent": {
-										"$ref": "AAAAAAFpjV5bqAJ3JIo="
-									},
-									"name": "dictionaryToCopy",
-									"type": "const Dictionary&"
-								}
-							]
-						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFpjV/NbAPTBD4=",
@@ -15407,6 +15661,26 @@
 							"visibility": "private",
 							"type": "Type"
 						},
+						{
+							"_type": "UMLAttribute",
+							"_id": "AAAAAAFqIL0EWdtaPjA=",
+							"_parent": {
+								"$ref": "AAAAAAFpi0CGE0bDrWA="
+							},
+							"name": "quotedParameter",
+							"visibility": "private",
+							"type": "boolean"
+						},
+						{
+							"_type": "UMLAttribute",
+							"_id": "AAAAAAFqIL08ttxvd7s=",
+							"_parent": {
+								"$ref": "AAAAAAFpi0CGE0bDrWA="
+							},
+							"name": "quotedValue",
+							"visibility": "private",
+							"type": "boolean"
+						},
 						{
 							"_type": "UMLAttribute",
 							"_id": "AAAAAAFpsYaSBx3F3ms=",
@@ -15493,44 +15767,6 @@
 									"direction": "return"
 								}
 							]
-						},
-						{
-							"_type": "UMLOperation",
-							"_id": "AAAAAAFpsYJH8BPEwfM=",
-							"_parent": {
-								"$ref": "AAAAAAFpi0CGE0bDrWA="
-							},
-							"name": "addChar",
-							"visibility": "private",
-							"parameters": [
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpsYL72RSLITs=",
-									"_parent": {
-										"$ref": "AAAAAAFpsYJH8BPEwfM="
-									},
-									"name": "pointer",
-									"type": "char*"
-								},
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpsYL72hSM8fo=",
-									"_parent": {
-										"$ref": "AAAAAAFpsYJH8BPEwfM="
-									},
-									"name": "character",
-									"type": "const char"
-								},
-								{
-									"_type": "UMLParameter",
-									"_id": "AAAAAAFpsYL72hSNOyQ=",
-									"_parent": {
-										"$ref": "AAAAAAFpsYJH8BPEwfM="
-									},
-									"type": "char *",
-									"direction": "return"
-								}
-							]
 						}
 					]
 				},
@@ -15726,6 +15962,14 @@
 								"$ref": "AAAAAAFpsX8qmvfMwms="
 							},
 							"name": "SEPARATION"
+						},
+						{
+							"_type": "UMLEnumerationLiteral",
+							"_id": "AAAAAAFqILyyUdmvZ+w=",
+							"_parent": {
+								"$ref": "AAAAAAFpsX8qmvfMwms="
+							},
+							"name": "DONE"
 						}
 					]
 				},
@@ -16066,6 +16310,44 @@
 								}
 							]
 						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqIKKVAYk+EmM=",
+							"_parent": {
+								"$ref": "AAAAAAFpzh97jWHTX3Y="
+							},
+							"name": "const isQuotedParameter",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKO1MItiU/A=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKKVAYk+EmM="
+									},
+									"type": "const bool",
+									"direction": "return"
+								}
+							]
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqIKO2NYu+nHQ=",
+							"_parent": {
+								"$ref": "AAAAAAFpzh97jWHTX3Y="
+							},
+							"name": "const isQuotedValue",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqIKRMNoyXvtk=",
+									"_parent": {
+										"$ref": "AAAAAAFqIKO2NYu+nHQ="
+									},
+									"type": "const bool",
+									"direction": "return"
+								}
+							]
+						},
 						{
 							"_type": "UMLOperation",
 							"_id": "AAAAAAFpzik3lJwrhYM=",
@@ -16232,6 +16514,120 @@
 							}
 						}
 					]
+				},
+				{
+					"_type": "UMLClass",
+					"_id": "AAAAAAFqILBGHMl7EOQ=",
+					"_parent": {
+						"$ref": "AAAAAAFF+qBWK6M3Z8Y="
+					},
+					"name": "StringEntity",
+					"attributes": [
+						{
+							"_type": "UMLAttribute",
+							"_id": "AAAAAAFqILuHJdT479Q=",
+							"_parent": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"name": "string",
+							"type": "char *"
+						}
+					],
+					"operations": [
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqILCV/cvDnpc=",
+							"_parent": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"name": "StringEntity",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqILDzn8y6FaA=",
+									"_parent": {
+										"$ref": "AAAAAAFqILCV/cvDnpc="
+									},
+									"name": "string",
+									"type": "const char *"
+								}
+							]
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqILEoks1w0xw=",
+							"_parent": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"name": "StringEntity",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqILGHE84NK6M=",
+									"_parent": {
+										"$ref": "AAAAAAFqILEoks1w0xw="
+									},
+									"name": "Object",
+									"type": "const StringEntity&"
+								}
+							]
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqILGjIs7DhXw=",
+							"_parent": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"name": "~StringEntity"
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqILIYSNFBqbs=",
+							"_parent": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"name": "getString",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqILJWSdI4uOc=",
+									"_parent": {
+										"$ref": "AAAAAAFqILIYSNFBqbs="
+									},
+									"type": "char *",
+									"direction": "return"
+								}
+							]
+						},
+						{
+							"_type": "UMLOperation",
+							"_id": "AAAAAAFqILJv6NLu0DE=",
+							"_parent": {
+								"$ref": "AAAAAAFqILBGHMl7EOQ="
+							},
+							"name": "split",
+							"parameters": [
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqILrg79OLYYA=",
+									"_parent": {
+										"$ref": "AAAAAAFqILJv6NLu0DE="
+									},
+									"name": "character",
+									"type": "char"
+								},
+								{
+									"_type": "UMLParameter",
+									"_id": "AAAAAAFqILrg8NOMZ1k=",
+									"_parent": {
+										"$ref": "AAAAAAFqILJv6NLu0DE="
+									},
+									"type": "Dictionary<StringEntity>*",
+									"direction": "return"
+								}
+							]
+						}
+					]
 				}
 			]
 		}