Index: src/main/webapp/domainsrepo/7issues/7issues.json
===================================================================
--- src/main/webapp/domainsrepo/7issues/7issues.json	(revision 43)
+++ src/main/webapp/domainsrepo/7issues/7issues.json	(revision 1)
@@ -3,23 +3,23 @@
 	"issuesValues": {
 		"i1": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		},
 		"i2": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		},
 		"i3": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		},
 		"i4": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		},
 		"i5": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		},
 		"i6": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		},
 		"i7": {
-			"range": {"low":0,"high":9,"step":1} 
+			"range": ["0", "9", "1"]
 		}
 	}
Index: src/main/webapp/domainsrepo/7issues/7issues1.json
===================================================================
--- src/main/webapp/domainsrepo/7issues/7issues1.json	(revision 43)
+++ src/main/webapp/domainsrepo/7issues/7issues1.json	(revision 1)
@@ -4,57 +4,64 @@
 		"issueUtilities": {
 			"i1": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.11,
 					"highValue": 9,
 					"highUtility": 0.99
+
 				}
 			},
 			"i2": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.12,
 					"highValue": 9,
 					"highUtility": 0.97
+
 				}
 			},
 			"i3": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.13,
 					"highValue": 9,
 					"highUtility": 0.96
+
 				}
 			},
 			"i4": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.14,
 					"highValue": 9,
 					"highUtility": 0.94
+
 				}
 			},
 			"i5": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.15,
 					"highValue": 9,
 					"highUtility": 0.93
+
 				}
 			},
 			"i6": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.16,
 					"highValue": 9,
 					"highUtility": 0.92
+
 				}
 			},
 			"i7": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.16,
 					"highValue": 9,
 					"highUtility": 0.91
+
 				}
 			}
@@ -73,23 +80,23 @@
 			"issuesValues": {
 				"i1": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i2": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i3": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i4": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i5": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i6": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i7": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				}
 			}
Index: src/main/webapp/domainsrepo/7issues/7issues2.json
===================================================================
--- src/main/webapp/domainsrepo/7issues/7issues2.json	(revision 43)
+++ src/main/webapp/domainsrepo/7issues/7issues2.json	(revision 1)
@@ -4,68 +4,75 @@
 		"issueUtilities": {
 			"i1": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.51,
 					"highValue": 9,
 					"highUtility": 0.11
+
 				}
 			},
 			"i2": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.92,
 					"highValue": 9,
 					"highUtility": 0.21
+
 				}
 			},
 			"i3": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.93,
 					"highValue": 9,
 					"highUtility": 0.13
+
 				}
 			},
 			"i4": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.94,
 					"highValue": 9,
 					"highUtility": 0.14
+
 				}
 			},
 			"i5": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.95,
 					"highValue": 9,
 					"highUtility": 0.15
+
 				}
 			},
 			"i6": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.96,
 					"highValue": 9,
 					"highUtility": 0.16
+
 				}
 			},
 			"i7": {
-				"NumberValueSetUtilities": {
+				"numberutils": {
 					"lowValue": 0,
 					"lowUtility": 0.97,
 					"highValue": 9,
 					"highUtility": 0.17
+
 				}
 			}
 		},
 		"issueWeights": {
-			"i1": 0.24746,
-			"i2": 0.118241,
-			"i3": 0.186047,
-			"i4": 0.206295,
-			"i5": 0.161126,
+			"i1": 0.24745759773026107,
+			"i2": 0.11824193959921694,
+			"i3": 0.1860471425098606,
+			"i4": 0.20629555826677742,
+			"i5": 0.16112666189388397,
 			"i6": 0.0538874,
-			"i7": 0.0269436
+			"i7": 0.0269437
 		},
 		"domain": {
@@ -73,23 +80,23 @@
 			"issuesValues": {
 				"i1": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i2": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i3": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i4": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i5": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i6": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				},
 				"i7": {
-					"range": {"low":0,"high":9,"step":1} 
+					"range": ["0", "9", "1"]
 				}
 			}
Index: src/main/webapp/domainsrepo/jobs/jobs1.json
===================================================================
--- src/main/webapp/domainsrepo/jobs/jobs1.json	(revision 43)
+++ src/main/webapp/domainsrepo/jobs/jobs1.json	(revision 1)
@@ -3,5 +3,5 @@
 		"issueUtilities": {
 			"salary": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"2000": 0,
@@ -14,5 +14,5 @@
 			},
 			"fte": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"0.6": 0.25,
@@ -23,5 +23,5 @@
 			},
 			"work from home": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"0": 0.333333333,
@@ -32,5 +32,5 @@
 			},
 			"lease car": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"yes": 1,
@@ -40,5 +40,5 @@
 			},
 			"permanent contract": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"yes": 1,
@@ -48,5 +48,5 @@
 			},
 			"career development opportunities": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"low": 0,
@@ -115,9 +115,9 @@
 		"reservationBid": {
 			"issuevalues": {
-				"salary": "3500",
+				"salary": "300",
 				"fte": "0.8",
-				"work from home": "1",
+				"work from home": "0",
 				"lease car": "no",
-				"permanent contract": "yes",
+				"permanent contract": "no",
 				"career development opportunities": "medium"
 			}
Index: src/main/webapp/domainsrepo/jobs/jobs1_20.json
===================================================================
--- src/main/webapp/domainsrepo/jobs/jobs1_20.json	(revision 43)
+++ 	(revision )
@@ -1,403 +1,0 @@
-{
-	"DefaultPartialOrdering": {
-		"name": "jobs1_20",
-		"domain": {
-			"name": "jobs",
-			"issuesValues": {
-				"lease car": {
-					"values": ["yes", "no"]
-				},
-				"permanent contract": {
-					"values": ["yes", "no"]
-				},
-				"career development opportunities": {
-					"values": ["low", "medium", "high"]
-				},
-				"fte": {
-					"values": ["0.6", "0.8", "1.0"]
-				},
-				"salary": {
-					"values": ["2000", "2500", "3000", "3500", "4000"]
-				},
-				"work from home": {
-					"values": ["0", "1", "2"]
-				}
-			}
-		},
-		"better": [
-			[0, 34],
-			[2, 9],
-			[3, 5],
-			[6, 23],
-			[12, 18],
-			[13, 27],
-			[14, 28],
-			[15, 37],
-			[17, 28],
-			[19, 1],
-			[20, 29],
-			[21, 24],
-			[22, 8],
-			[25, 10],
-			[26, 16],
-			[30, 24],
-			[31, 32],
-			[33, 7],
-			[35, 4],
-			[36, 11]
-		],
-		"bids": [{
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "0.8",
-				"salary": "4000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "high",
-				"fte": "0.6",
-				"salary": "2000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "low",
-				"fte": "0.8",
-				"salary": "2000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "0.8",
-				"salary": "2500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "0.6",
-				"salary": "2000",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "high",
-				"fte": "0.6",
-				"salary": "2500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "1.0",
-				"salary": "3500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "medium",
-				"fte": "1.0",
-				"salary": "3000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "0.6",
-				"salary": "3500",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "0.6",
-				"salary": "2000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "high",
-				"fte": "0.6",
-				"salary": "2000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "0.8",
-				"salary": "3500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "0.6",
-				"salary": "2500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "0.8",
-				"salary": "3000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "0.8",
-				"salary": "2000",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "1.0",
-				"salary": "3500",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "medium",
-				"fte": "0.8",
-				"salary": "4000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "0.8",
-				"salary": "3000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "0.8",
-				"salary": "2000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "1.0",
-				"salary": "3000",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "1.0",
-				"salary": "4000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "low",
-				"fte": "1.0",
-				"salary": "3500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "yes",
-				"career development opportunities": "medium",
-				"fte": "1.0",
-				"salary": "2500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "low",
-				"fte": "1.0",
-				"salary": "3000",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "medium",
-				"fte": "0.8",
-				"salary": "3000",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "0.8",
-				"salary": "2000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "0.8",
-				"salary": "3500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "0.6",
-				"salary": "4000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "low",
-				"fte": "0.6",
-				"salary": "2000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "low",
-				"fte": "0.6",
-				"salary": "3500",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "high",
-				"fte": "0.8",
-				"salary": "4000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "0.8",
-				"salary": "4000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "high",
-				"fte": "0.8",
-				"salary": "2500",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "yes",
-				"career development opportunities": "medium",
-				"fte": "1.0",
-				"salary": "4000",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "high",
-				"fte": "0.6",
-				"salary": "2500",
-				"work from home": "2"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "yes",
-				"career development opportunities": "low",
-				"fte": "0.8",
-				"salary": "3500",
-				"work from home": "0"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "high",
-				"fte": "1.0",
-				"salary": "4000",
-				"work from home": "1"
-			}
-		}, {
-			"issuevalues": {
-				"lease car": "yes",
-				"permanent contract": "no",
-				"career development opportunities": "medium",
-				"fte": "0.8",
-				"salary": "3500",
-				"work from home": "2"
-			}
-		}],
-		"reservationBid": {
-			"issuevalues": {
-				"lease car": "no",
-				"permanent contract": "no",
-				"career development opportunities": "low",
-				"fte": "0.6",
-				"salary": "3500",
-				"work from home": "1"
-			}
-		}
-	}
-}
Index: src/main/webapp/domainsrepo/jobs/jobs2.json
===================================================================
--- src/main/webapp/domainsrepo/jobs/jobs2.json	(revision 43)
+++ src/main/webapp/domainsrepo/jobs/jobs2.json	(revision 1)
@@ -3,5 +3,5 @@
 		"issueUtilities": {
 			"salary": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"2000": 1.0,
@@ -14,5 +14,5 @@
 			},
 			"fte": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"0.6": 0.363636363636363636,
@@ -23,5 +23,5 @@
 			},
 			"work from home": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"0": 1.0,
@@ -32,5 +32,5 @@
 			},
 			"lease car": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"yes": 0,
@@ -40,5 +40,5 @@
 			},
 			"permanent contract": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"yes": 0.23809523809523808,
@@ -48,5 +48,5 @@
 			},
 			"career development opportunities": {
-				"DiscreteValueSetUtilities": {
+				"discreteutils": {
 					"valueUtilities": {
 						"low": 1.0,
@@ -115,5 +115,5 @@
 		"reservationBid": {
 			"issuevalues": {
-				"salary": "3000",
+				"salary": "300",
 				"fte": "0.8",
 				"work from home": "0",
