new and old partjobshop instance updated

dream/simulation/Examples/JobShopAllInOneEmpty.json

 {
 	"class_definition" : {
 		"definitions" : {
-			"distributionTypes" : {
-				"_fixed" : {
-					"description" : "Fixed",
-					"title" : "Fixed",
-					"type" : "object",
-					"properties" : {
-						"mean" : {
-							"type" : "number",
-							"default" : 0.75,
-							"required" : true
-						}
-					}
-				},
-				"_exp" : {
-					"type" : "object",
-					"title": "Exp",
-					"description" : "Exponential",
-					"properties" : {
-						"mean" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
-						}
-					}
-				},
-				"_normal" : {
-					"type" : "object",
-					"title" : "Normal",
-					"description" : "Normal",
-					"properties" : {
-						"mean" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+			"distributionTypes": {
+				"_binomial": {
+					"description": "Binomial",
+					"properties": {
+						"mean": {
+							"default": 0,
+							"type": "number"
 						},
-						"stdev" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+						"size": {
+							"default": 0,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Binomial",
+					"type": "object"
 				},
-				"_lognormal" : {
-					"type" : "object",
-					"title" : "Lognormal",
-					"description" : "Lognormal",
-					"properties" : {
-						"mean" : {
-							"_class" : "Dream.Property",
-							"name" : "Mean",
-							"type" : "number",
-							"default" : 0
+				"_cauchy": {
+				    "description": "Cauchy",
+				    "properties": {
+				    	"location": {
+							"default": 0,
+							"type": "number"
 						},
-						"stdev" : {
-							"_class" : "Dream.Property",
-							"name" : "Standard Deviation",
-							"type" : "number",
-							"default" : 0
+						"scale": {
+							"default": 0,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Cauchy",
+					"type": "object"
 				},
-				"_binomial" : {
-					"type" : "object",
-					"title" : "Binomial",
-					"description" : "Binomial",
-					"properties" : {
-						"mean" : {
-							"type" : "number",
-							"default" : 0
-						},
-						"size" : {
-							"type" : "number",
-							"default" : 0
+				"_exp": {
+					"description": "Exponential",
+					"properties": {
+						"mean": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Exp",
+					"type": "object"
 				},
-				"_poisson" : {
-					"type" : "object",
-					"title" : "Poisson",
-					"description" : "Poisson",
-					"properties" : {
-						"lambda" : {
-							"type" : "number",
-							"default" : 0
+				"_failure": {
+					"properties": {
+						"Time to Failure": {
+							"$ref": "#/definitions/_dist"
+						},
+						"Time to Repair": {
+							"$ref": "#/definitions/_dist"
+						},
+						"repairman": {
+							"description": "Repairman",
+							"required": true,
+							"type": "string"
 						}
-					}
+					},
+					"title": "Yes",
+					"type": "object"
 				},
-				"_logistic" : {
-					"type" : "object",
-					"title" : "Logistic",
-					"description" : "Logistic",
-					"properties" : {
-						"location" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
-						},
-						"scale" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+				"_fixed": {
+					"title": "Fixed",
+					"properties": {
+						"mean": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"type": "object"
 				},
-				"_caucy" : {
-					"type" : "object",
-					"title" : "Caucy",
-					"description" : "Caucy",
-					"properties" : {
-						"location" : {
-							"type" : "number",
-							"default" : 0
+				"_gama": {
+					"description": "Gama",
+					"properties": {
+						"rate": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						},
-						"scale" : {
-							"type" : "number",
-							"default" : 0
+						"shape": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Gama",
+					"type": "object"
 				},
-				"_geometric" : {
-					"type" : "object",
-					"title" : "Geometric",
-					"description" : "Geometric",
-					"properties" : {
-						"probability" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+				"_geometric": {
+					"description": "Geometric",
+					"properties": {
+						"probability": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Geometric",
+					"type": "object"
 				},
-				"_gama" : {
-					"type" : "object",
-					"title" : "Gama",
-					"description" : "Gama",
-					"properties" : {
-						"shape" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+				"_logistic": {
+					"description": "Logistic",
+					"properties": {
+						"location": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						},
-						"rate" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+						"scale": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Logistic",
+					"type": "object"
 				},
-				"_weibull" : {
-					"type" : "object",
-					"title" : "Weibull",
-					"description" : "Weibull",
-					"properties" : {
-						"shape" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+				"_lognormal": {
+					"description": "Lognormal",
+					"properties": {
+						"mean": {
+							"default": 0,
+							"name": "Mean",
+							"type": "number"
 						},
-						"scale" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+						"stdev": {
+							"default": 0,
+							"name": "Standard Deviation",
+							"type": "number"
 						}
-					}
+					},
+					"title": "Lognormal",
+					"type": "object"
 				},
-				"_fixedFailure" : {
-					"type" : "object",
-					"title" : "Fixed",
-					"description" : "Fixed",
-					"properties" : {
-						"MTTF" : {
-							"description" : "Mean Time To Failure",
-							"type" : "number",
-							"default" : 40,
-							"required" : true
-						},
-						"MTTR" : {
-							"description" : "Mean Time To Repair",
-							"type" : "number",
-							"default" : 10,
-							"required" : true
+				"_no": {
+					"description": "None",
+					"title": "No",
+					"type": "string"
+				},
+				"_normal": {
+					"description": "Normal",
+					"properties": {
+						"mean": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						},
-						"repairman" : {
-							"description" : "Repairman",
-							"type" : "string",
-							"required" : true
+						"stdev": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Normal",
+					"type": "object"
 				},
-				"_no" : {
-					"type" : "string",
-					"title" : "No",
-					"description" : "None"
+				"_poisson": {
+					"description": "Poisson",
+					"properties": {
+						"lambda": {
+							"default": 0,
+							"type": "number"
+						}
+					},
+					"title": "Poisson",
+					"type": "object"
 				},
-				"_availability" : {
-					"type" : "object",
-					"title" : "Availability",
-					"description" : "Availability",
-					"properties" : {
-						"MTTF" : {
-							"description" : "Mean Time To Failure",
-							"type" : "number",
-							"default" : 40,
-							"required" : true
-						},
-						"MTTR" : {
-							"description" : "Mean Time To Failure",
-							"default" : 10,
-							"type" : "number",
-							"required" : true
-						},
-						"availability" : {
-							"type" : "number",
-							"default" : 0,
-							"required" : true
+				"_weibull": {
+					"description": "Weibull",
+					"properties": {
+						"scale": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						},
-						"repairman" : {
-							"description" : "Repairman",
-							"type" : "string",
-							"required" : true
+						"shape": {
+							"default": 0,
+							"required": true,
+							"type": "number"
 						}
-					}
+					},
+					"title": "Weibull",
+					"type": "object"
 				}
 			},
 			"_failureDist" : {
@@ -234,14 +195,13 @@
 								"default" : "No",
 								"enum" : [
 									"No",
-									"Fixed",
-									"Availability"
+									"Yes"
 								]
 							}
 						}
 					}, {
 						"oneOf" : [{
-								"$ref" : "#/definitions/distributionTypes/_fixedFailure"
+								"$ref" : "#/definitions/distributionTypes/_failure"
 							}, {
 								"$ref" : "#/definitions/distributionTypes/_no"
 							}, {
@@ -266,7 +226,7 @@
 									"Binomial",
 									"Poisson",
 									"Logistic",
-									"Caucy",
+									"Cauchy",
 									"Geometric",
 									"Gama",
 									"Weibull"
@@ -289,7 +249,7 @@
 							}, {
 								"$ref" : "#/definitions/distributionTypes/_logistic"
 							}, {
-								"$ref" : "#/definitions/distributionTypes/_caucy"
+								"$ref" : "#/definitions/distributionTypes/_cauchy"
 							}, {
 								"$ref" : "#/definitions/distributionTypes/_geometric"
 							}, {
@@ -407,12 +367,11 @@
 			"_class" : "node",
 			"name" : "Exit",
 			"description" : "A station where entities exits from the system",
-                        "css": {
-                          "border": "1px solid #ccb",
-                          "backgroundColor": "#eef",
-                          "backgroundImage": "linear-gradient(to bottom, #eef 0%, #dde 100%)"
-                        },
-                        "shape": "rectangle",
+			"css": {
+				"border": "1px solid #ccb",
+				"backgroundColor": "#eef",
+				"backgroundImage": "linear-gradient(to bottom, #eef 0%, #dde 100%)"
+			},
 			"allOf" : [{
 					"$ref" : "#/node"
 				}, {
@@ -433,12 +392,12 @@
 		"Dream.ConditionalBuffer":{
 			"name" : "Cam Queue",
 			"_class":"node",
-                        "description" : "A buffer where entities can be hold until the next station is ready to process them and a certain condition is met",
-                        "css": {
-                          "border": "1px solid #bcc",
-                          "backgroundColor": "#eff",
-                          "backgroundImage": "linear-gradient(to bottom, #eff 0%, #dee 100%)"
-                        },
+			"description" : "A buffer where entities can be hold until the next station is ready to process them and a certain condition is met",
+			"css": {
+				"border": "1px solid #bcc",
+				"backgroundColor": "#eff",
+				"backgroundImage": "linear-gradient(to bottom, #eff 0%, #dee 100%)"
+			},
 			"allOf" : [{
 					"$ref" : "#/node"
 				}, {
@@ -468,11 +427,11 @@
 			"name":"Assembly Queue",
 			"_class":"node",
 			"description" : "A buffer where entities can be hold until the next assembly is ready to process all the entities from the same production-order",
-                        "css": {
-                          "border": "1px solid #bcc",
-                          "backgroundColor": "#eff",
-                          "backgroundImage": "linear-gradient(to bottom, #eff 0%, #dee 100%)"
-                        },
+			"css": {
+				"border": "1px solid #bcc",
+				"backgroundColor": "#eff",
+				"backgroundImage": "linear-gradient(to bottom, #eff 0%, #dee 100%)"
+			},
 			"allOf" : [{
 					"$ref" : "#/Dream.ConditionalBuffer"
 				}, {
@@ -494,11 +453,11 @@
 			"name":"Decomposition",
 			"_class":"node",
 			"description" : "A station where production-orders are decomposed into components ",
-                        "css": {
-                          "border": "1px solid #bcc",
-                          "backgroundColor": "#eff",
-                          "backgroundImage": "linear-gradient(to bottom, #eff 0%, #dee 100%)"
-                        },
+			"css": {
+				"border": "1px solid #bcc",
+				"backgroundColor": "#eff",
+				"backgroundImage": "linear-gradient(to bottom, #eff 0%, #dee 100%)"
+			},
 			"allOf" : [{
 					"$ref" : "#/node"
 				}, {
@@ -516,11 +475,11 @@
 		"Dream.MachineJobShop":{
 			"name" : "Machine",
 			"description" : "A station processing items for some time given by a distribution provided by the entities that are processed",
-      "css": {
-        "border": "1px solid #cbc",
-        "backgroundColor": "#fef",
-        "backgroundImage": "linear-gradient(to bottom, #fef 0%, #ede 100%)"
-      },
+			"css": {
+				"border": "1px solid #cbc",
+				"backgroundColor": "#fef",
+				"backgroundImage": "linear-gradient(to bottom, #fef 0%, #ede 100%)"
+			},
 			"_class" : "node",
 			"allOf" : [{
 					"$ref" : "#/node"
@@ -545,11 +504,11 @@
 			]
 		},
 		"Dream.MouldAssembly":{
-      "css": {
-        "border": "1px solid #cbc",
-        "backgroundColor": "#fef",
-        "backgroundImage": "linear-gradient(to bottom, #fef 0%, #ede 100%)"
-      },
+			"css": {
+				"border": "1px solid #cbc",
+				"backgroundColor": "#fef",
+				"backgroundImage": "linear-gradient(to bottom, #fef 0%, #ede 100%)"
+			},
 			"name" : "Assembly",
 			"description" : "A station that assembles different components of the same production order into a single entity",
 			"_class":"node",
@@ -567,15 +526,15 @@
 				}
 			]
 		},
-		"Dream.OperatorManagedJob":{
+		"Dream.Operator":{
 			"name" : "Operator",
 			"_class" : "node",
 			"description" : "A resource that operates stations",
-      "css": {
-        "border": "1px solid #cbb",
-        "backgroundColor": "#fdd",
-        "backgroundImage": "linear-gradient(to bottom, #fdd 0%, #dcc 100%)"
-      },
+			"css": {
+				"border": "1px solid #cbb",
+				"backgroundColor": "#fdd",
+				"backgroundImage": "linear-gradient(to bottom, #fdd 0%, #dcc 100%)"
+			},
 			"allOf" : [{
 					"$ref" : "#/node"
 				}, {
@@ -607,6 +566,11 @@
 				"type" : "object_view",
 				"gadget" : "Input_viewProductionLine"
 			},
+			"view_management": {
+				"gadget": "Input_viewDocumentManagement",
+				"type": "object_view",
+				"title": "Manage document"
+			},
 			"view_production_orders_spreadsheet" : {
 				"gadget" : "Input_viewSpreadsheet",
 				"type" : "object_view",
@@ -765,6 +729,11 @@
 				"gadget": "Input_viewResultList",
 				"type": "object_view",
 				"title": "Results"
+			},
+			"debug": {
+				"gadget": "Input_viewDebugJson",
+				"type": "object_view",
+				"title": "Debug JSON"
 			}
 		},
 		"output" : {
@@ -839,31 +808,27 @@
 			}
 		},
 		"pre_processing" : {
-			"description" : "",
 			"plugin_list" : [{
-					"_class" : "dream.plugins.PartJobShop.PartJobShop",
+					"_class" : "PartJobShop",
 					"input_id" : "Simulation"
 				}, {
-					"_class" : "dream.plugins.ReadShiftFromSpreadsheet.ReadShiftFromSpreadsheet",
+					"_class" : "ReadShiftFromSpreadsheet",
 					"input_id" : "ShiftSpreadsheet"
 				}, {
-					"_class" : "dream.plugins.ReadWipFromSpreadsheet.ReadWipFromSpreadsheet",
+					"_class" : "ReadWipFromSpreadsheet",
 					"input_id" : "WipSpreadsheet"
 				}, {
-					"_class" : "dream.plugins.ReadRouteFromSpreadsheet.ReadRouteFromSpreadsheet",
+					"_class" : "ReadRouteFromSpreadsheet",
 					"input_id" : "RouteSpreadsheet"
 				}
 			]
 		},
 		"processing_plugin" : {
-			"description" : "",
-			"_class" : "",
-			"input_id" : ""
-		}
+			"_class" : "CalculateConfidenceIntervals"
+		},
 		"post_processing" : {
-			"description" : "",
 			"plugin_list" : [{
-				"_class" : "dream.plugins.CalculateConfidenceIntervals.CalculateConfidenceIntervals"
+				"_class" : "CalculateConfidenceIntervals"
 			}]
 		},
 		"general" : {

dream/simulation/Examples/PartJobShopAllInOneEmpty.json

@@ -2,227 +2,193 @@
   "class_definition": {
     "definitions": {
       "distributionTypes": {
-        "_fixed": {
-          "description": "Fixed",
-          "name": "Fixed",
-          "type": "object",
-          "properties": {
-            "mean": {
-              "type": "number",
-              "default": 0.75,
-              "required": true
-            }
-          }
-        },
-        "_exp": {
-          "type": "object",
-          "name": "Exp",
-          "description": "Exponential",
+        "_binomial": {
+          "description": "Binomial",
           "properties": {
             "mean": {
-              "type": "number",
               "default": 0,
-              "required": true
+              "type": "number"
+            },
+            "size": {
+              "default": 0,
+              "type": "number"
             }
-          }
+          },
+          "title": "Binomial",
+          "type": "object"
         },
-        "_normal": {
-          "type": "object",
-          "name": "Normal",
-          "description": "Normal",
+        "_cauchy": {
+          "description": "Cauchy",
           "properties": {
-            "mean": {
-              "type": "number",
+            "location": {
               "default": 0,
-              "required": true
+              "type": "number"
             },
-            "stdev": {
-              "type": "number",
+            "scale": {
               "default": 0,
-              "required": true
+              "type": "number"
             }
-          }
+          },
+          "title": "Cauchy",
+          "type": "object"
         },
-        "_lognormal": {
-          "type": "object",
-          "name": "Lognormal",
-          "description": "Lognormal",
+        "_exp": {
+          "description": "Exponential",
           "properties": {
             "mean": {
-              "name": "Mean",
-              "type": "number",
-              "default": 0
-            },
-            "stdev": {
-              "name": "Standard Deviation",
-              "type": "number",
-              "default": 0
+              "default": 0,
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "title": "Exp",
+          "type": "object"
         },
-        "_binomial": {
-          "type": "object",
-          "name": "Binomial",
-          "description": "Binomial",
+        "_failure": {
           "properties": {
-            "mean": {
-              "type": "number",
-              "default": 0
+            "Time to Failure": {
+              "$ref": "#/definitions/_dist"
             },
-            "size": {
-              "type": "number",
-              "default": 0
+            "Time to Repair": {
+              "$ref": "#/definitions/_dist"
+            },
+            "repairman": {
+              "description": "Repairman",
+              "required": true,
+              "type": "string"
             }
-          }
+          },
+          "title": "Yes",
+          "type": "object"
         },
-        "_poisson": {
-          "type": "object",
-          "name": "Poisson",
-          "description": "Poisson",
+        "_fixed": {
+          "title": "Fixed",
           "properties": {
-            "lambda": {
-              "type": "number",
-              "default": 0
+            "mean": {
+              "default": 0,
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "type": "object"
         },
-        "_logistic": {
-          "type": "object",
-          "name": "Logistic",
-          "description": "Logistic",
+        "_gama": {
+          "description": "Gama",
           "properties": {
-            "location": {
-              "type": "number",
+            "rate": {
               "default": 0,
-              "required": true
+              "required": true,
+              "type": "number"
             },
-            "scale": {
-              "type": "number",
+            "shape": {
               "default": 0,
-              "required": true
-            }
-          }
-        },
-        "_caucy": {
-          "type": "object",
-          "name": "Caucy",
-          "description": "Caucy",
-          "properties": {
-            "location": {
-              "type": "number",
-              "default": 0
-            },
-            "scale": {
-              "type": "number",
-              "default": 0
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "title": "Gama",
+          "type": "object"
         },
         "_geometric": {
-          "type": "object",
-          "name": "Geometric",
           "description": "Geometric",
           "properties": {
             "probability": {
-              "type": "number",
               "default": 0,
-              "required": true
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "title": "Geometric",
+          "type": "object"
         },
-        "_gama": {
-          "type": "object",
-          "name": "Gama",
-          "description": "Gama",
+        "_logistic": {
+          "description": "Logistic",
           "properties": {
-            "shape": {
-              "type": "number",
+            "location": {
               "default": 0,
-              "required": true
+              "required": true,
+              "type": "number"
             },
-            "rate": {
-              "type": "number",
+            "scale": {
               "default": 0,
-              "required": true
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "title": "Logistic",
+          "type": "object"
         },
-        "_weibull": {
-          "type": "object",
-          "name": "Weibull",
-          "description": "Weibull",
+        "_lognormal": {
+          "description": "Lognormal",
           "properties": {
-            "shape": {
-              "type": "number",
+            "mean": {
+              "_class": "Dream.Property",
               "default": 0,
-              "required": true
+              "name": "Mean",
+              "type": "number"
             },
-            "scale": {
-              "type": "number",
+            "stdev": {
+              "_class": "Dream.Property",
               "default": 0,
-              "required": true
+              "name": "Standard Deviation",
+              "type": "number"
             }
-          }
+          },
+          "title": "Lognormal",
+          "type": "object"
         },
-        "_fixedFailure": {
-          "type": "object",
-          "name": "Fixed",
-          "description": "Fixed",
+        "_no": {
+          "description": "None",
+          "title": "No",
+          "type": "string"
+        },
+        "_normal": {
+          "description": "Normal",
           "properties": {
-            "MTTF": {
-              "description": "Mean Time To Failure",
-              "type": "number",
-              "default": 40,
-              "required": true
-            },
-            "MTTR": {
-              "description": "Mean Time To Repair",
-              "type": "number",
-              "default": 10,
-              "required": true
+            "mean": {
+              "default": 0,
+              "required": true,
+              "type": "number"
             },
-            "repairman": {
-              "description": "Repairman",
-              "type": "string",
-              "required": true
+            "stdev": {
+              "default": 0,
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "title": "Normal",
+          "type": "object"
         },
-        "_no": {
-          "type": "string",
-          "name": "No",
-          "description": "None"
+        "_poisson": {
+          "description": "Poisson",
+          "properties": {
+            "lambda": {
+              "default": 0,
+              "type": "number"
+            }
+          },
+          "title": "Poisson",
+          "type": "object"
         },
-        "_availability": {
-          "type": "object",
-          "name": "Availability",
-          "description": "Availability",
+        "_weibull": {
+          "description": "Weibull",
           "properties": {
-            "MTTF": {
-              "description": "Mean Time To Failure",
-              "type": "number",
-              "default": 40,
-              "required": true
-            },
-            "MTTR": {
-              "description": "Mean Time To Failure",
-              "default": 10,
-              "type": "number",
-              "required": true
-            },
-            "availability": {
-              "type": "number",
+            "scale": {
               "default": 0,
-              "required": true
+              "required": true,
+              "type": "number"
             },
-            "repairman": {
-              "description": "Repairman",
-              "type": "string",
-              "required": true
+            "shape": {
+              "default": 0,
+              "required": true,
+              "type": "number"
             }
-          }
+          },
+          "title": "Weibull",
+          "type": "object"
         }
-      },
+      }
+    },
       "_failureDist": {
         "allOf": [
           {
@@ -233,8 +199,7 @@
                 "default": "No",
                 "enum": [
                   "No",
-                  "Fixed",
-                  "Availability"
+                  "Yes"
                 ]
               }
             }
@@ -242,13 +207,10 @@
           {
             "oneOf": [
               {
-                "$ref": "#/definitions/distributionTypes/_fixedFailure"
+                "$ref": "#/definitions/distributionTypes/_failure"
               },
               {
                 "$ref": "#/definitions/distributionTypes/_no"
-              },
-              {
-                "$ref": "#/definitions/distributionTypes/_availability"
               }
             ]
           }
@@ -270,7 +232,7 @@
                   "Binomial",
                   "Poisson",
                   "Logistic",
-                  "Caucy",
+                  "Cauchy",
                   "Geometric",
                   "Gama",
                   "Weibull"
@@ -302,7 +264,7 @@
                 "$ref": "#/definitions/distributionTypes/_logistic"
               },
               {
-                "$ref": "#/definitions/distributionTypes/_caucy"
+                "$ref": "#/definitions/distributionTypes/_cauchy"
               },
               {
                 "$ref": "#/definitions/distributionTypes/_geometric"
@@ -486,7 +448,7 @@
         }
       ]
     },
-    "Dream.QueueManagedJob": {
+    "Dream.QueueJobShop": {
       "name": "Queue",
       "_class": "node",
       "description": "A queue for jobs",
@@ -575,7 +537,7 @@
         }
       ]
     },
-    "Dream.MachineManagedJob": {
+    "Dream.MachineJobShop": {
       "name": "Machine",
       "description": "A station processing items for some time given by a distribution provided by the entities that are processed",
       "css": {
@@ -633,7 +595,7 @@
         }
       ]
     },
-    "Dream.OperatorManagedJob": {
+    "Dream.Operator": {
       "name": "Operator",
       "_class": "node",
       "description": "A resource that operates stations",
@@ -811,8 +773,7 @@
       }
     },
     "pre_processing": {
-      "description" : "",
-      "_plugin_list": [
+       "plugin_list": [
         {
           "_class": "dream.plugins.Debug.Debug",
           "argument": "Argument Value"
@@ -824,12 +785,10 @@
       ]
     },
     "processing_plugin": {
-      "description": "",
       "_class": "dream.plugins.ACO.ACO"
     },
     "post_processing": {
-      "description": "",
-	  "plugin_list": []
+      "plugin_list": []
     },
     "general": {
       "properties": {