diff --git a/.fuseki.ttl b/.fuseki.ttl
index 1831fae..7fedb91 100644
--- a/.fuseki.ttl
+++ b/.fuseki.ttl
@@ -12,6 +12,7 @@
     fuseki:name         "DTDF" ;												# Name of the dataset in the endpoint url
     fuseki:serviceReadWriteGraphStore "data" ;											# SPARQL Graph store protocol (read and write)
     fuseki:endpoint 	[ fuseki:operation fuseki:query ;	fuseki:name "sparql"  ] ;	# SPARQL query service
+    fuseki:endpoint     [ fuseki:operation fuseki:update ; fuseki:name "update" ] ;  # SPARQL update service (Write access)
     fuseki:endpoint 	[ fuseki:operation fuseki:shacl ;	fuseki:name "shacl" ] ;		# SHACL query service
     fuseki:dataset      <#dataset> .
 
diff --git a/ci_screenshots/2026-03-19_828b9fd.png b/ci_screenshots/2026-03-19_828b9fd.png
new file mode 100644
index 0000000..299b12f
Binary files /dev/null and b/ci_screenshots/2026-03-19_828b9fd.png differ
diff --git a/ci_screenshots/2026-03-19_b4fea18.png b/ci_screenshots/2026-03-19_b4fea18.png
new file mode 100644
index 0000000..2ec10d7
Binary files /dev/null and b/ci_screenshots/2026-03-19_b4fea18.png differ
diff --git a/src/oml/bentleyjoakes.github.io/DTDF/vocab/DTDFVocab.oml b/src/oml/bentleyjoakes.github.io/DTDF/vocab/DTDFVocab.oml
index ac09c56..5c2c11b 100644
--- a/src/oml/bentleyjoakes.github.io/DTDF/vocab/DTDFVocab.oml
+++ b/src/oml/bentleyjoakes.github.io/DTDF/vocab/DTDFVocab.oml
@@ -106,6 +106,7 @@ vocabulary <https://bentleyjoakes.github.io/DTDF/vocab/DTDFVocab#> as DTDFVocab
 		to TimeScale
 		forward hasTimeScale
 	]
+	concept TimeScaleDescription < base:DescribedThing
 	
 	//------------------------------
 	// C8: Multiplicity
diff --git a/src/oml/bentleyjoakes.github.io/incubator/incubator_dt.oml b/src/oml/bentleyjoakes.github.io/incubator/incubator_dt.oml
index 393919a..6e495e6 100644
--- a/src/oml/bentleyjoakes.github.io/incubator/incubator_dt.oml
+++ b/src/oml/bentleyjoakes.github.io/incubator/incubator_dt.oml
@@ -171,7 +171,7 @@ description <https://bentleyjoakes.github.io/incubator/incubator_dt#> as incubat
 	]
 	
 	// C7: TimeScale
-	instance twinning_time_scale : DTDFVocab:TimeScale [
+	instance twinning_time_scale : DTDFVocab:TimeScaleDescription [
 		base:desc "The DT-to-PT synchronization occurs every time the PT sends a message to the DT (on a periodic basis)."
 	]
 	
diff --git a/website/static/DTInsight_web_export/DTInsight.html b/website/static/DTInsight_web_export/DTInsight.html
index 015b9f6..d9517ce 100644
--- a/website/static/DTInsight_web_export/DTInsight.html
+++ b/website/static/DTInsight_web_export/DTInsight.html
@@ -111,7 +111,7 @@
 
 		<script src="DTInsight.js"></script>
 		<script>
-const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"emscriptenPoolSize":8,"ensureCrossOriginIsolationHeaders":true,"executable":"DTInsight","experimentalVK":false,"fileSizes":{"DTInsight.pck":804164,"DTInsight.wasm":36160334},"focusCanvas":false,"gdextensionLibs":[],"godotPoolSize":4};
+const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"emscriptenPoolSize":8,"ensureCrossOriginIsolationHeaders":true,"executable":"DTInsight","experimentalVK":false,"fileSizes":{"DTInsight.pck":805252,"DTInsight.wasm":36160334},"focusCanvas":false,"gdextensionLibs":[],"godotPoolSize":4};
 const GODOT_THREADS_ENABLED = false;
 const engine = new Engine(GODOT_CONFIG);
 
diff --git a/website/static/DTInsight_web_export/DTInsight.pck b/website/static/DTInsight_web_export/DTInsight.pck
index f817133..58d4502 100644
Binary files a/website/static/DTInsight_web_export/DTInsight.pck and b/website/static/DTInsight_web_export/DTInsight.pck differ
diff --git a/website/static/data_dump.yaml b/website/static/data_dump.yaml
index 16699ad..aaa009f 100644
--- a/website/static/data_dump.yaml
+++ b/website/static/data_dump.yaml
@@ -1,269 +1,269 @@
 Services :
 	safe_adaptation
-		type : NamedIndividual/Component/Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : safe_adaptation
 		atStage : operation
 		enabledBy : state_estimator/optimization_algs
 		provides : controller_control
 	anomaly_detector
-		type : NamedIndividual/Component/Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : anomaly_detector
 		atStage : operation
 		enabledBy : state_estimator/anomaly_detector_enabler
 		provides : anomaly_warning
 	real_time_viz_service
-		type : NamedIndividual/Component/Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : real_time_viz_service
 		atStage : operation
 		enabledBy : godot
 		provides : real_time_viz
 		HasVisualization : true
 	policy_optimization
-		type : NamedIndividual/Component/Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : policy_optimization
 		atStage : operation
 		enabledBy : dashboard_enabler
 		provides : controller_control
 	heater_state_estimation_service
-		type : NamedIndividual/Component/Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : heater_state_estimation_service
 		atStage : operation
 		enabledBy : state_estimator
 		provides : heater_state_estimation
 	what_if_sim
-		type : NamedIndividual/Component/Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : Thing/DTComponent/Service/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : what_if_sim
 		atStage : operation
 		enabledBy : simulator
 		provides : what_if_sim_results
 Enablers :
 	simulator
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : simulator
 		enables : what_if_sim
 		hasInput : pt_model/controller_model/temp_readings_historical/env_model/pt_and_env_model
 	state_estimator
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : state_estimator
 		enables : safe_adaptation/anomaly_detector/heater_state_estimation_service
-		hasInput : four_para_model/ANN_state_estimation_model/ANN_model/two_para_model/controller_model
+		hasInput : ANN_state_estimation_model/ANN_model/four_para_model/two_para_model/controller_model
 	anomaly_detector_enabler
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : anomaly_detector_enabler
 		enables : anomaly_detector
-		hasInput : four_para_model/ANN_state_estimation_model/ANN_model/two_para_model
+		hasInput : ANN_state_estimation_model/ANN_model/four_para_model/two_para_model
 	optimization_algs
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : optimization_algs
 		enables : safe_adaptation
-		hasInput : four_para_model/ANN_state_estimation_model/temp_readings_streaming/ANN_model/two_para_model/controller_model
+		hasInput : ANN_state_estimation_model/temp_readings_streaming/ANN_model/four_para_model/two_para_model/controller_model
 	dashboard_enabler
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : dashboard_enabler
 		enables : policy_optimization
-		hasInput : four_para_model/ANN_state_estimation_model/temp_readings_streaming/ANN_model/two_para_model
+		hasInput : ANN_state_estimation_model/temp_readings_streaming/ANN_model/four_para_model/two_para_model
 	godot
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : godot
 		enables : real_time_viz_service
 	docker
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : docker
 	influx_db
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : influx_db
 	rabbit_mq
-		type : NamedIndividual/Component/Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
+		type : Thing/DTComponent/Enabler/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : rabbit_mq
 		IsCommEnabler : true
 Models :
-	four_para_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
-		file_loc_str : models/plant_models/four_parameters_model/four_parameter_model.py
-		sameAs : four_para_model
-		inputTo : state_estimator/anomaly_detector_enabler/optimization_algs/dashboard_enabler
 	pt_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : pt_model
 		inputTo : simulator
 	ANN_state_estimation_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : ANN_state_estimation_model
 		inputTo : state_estimator/anomaly_detector_enabler/optimization_algs/dashboard_enabler
 	ANN_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : ANN_model
 		inputTo : state_estimator/anomaly_detector_enabler/optimization_algs/dashboard_enabler
+	four_para_model
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
+		sameAs : four_para_model
+		inputTo : state_estimator/anomaly_detector_enabler/optimization_algs/dashboard_enabler
+		file_loc_str : models/plant_models/four_parameters_model/four_parameter_model.py
 	two_para_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : two_para_model
 		inputTo : state_estimator/anomaly_detector_enabler/optimization_algs/dashboard_enabler
 	controller_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : controller_model
 		inputTo : simulator/state_estimator/optimization_algs
 	env_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : env_model
 		inputTo : simulator
 	pt_and_env_model
-		type : NamedIndividual/Component/Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Model/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : pt_and_env_model
 		inputTo : simulator
 ProvidedThings :
 	dashboard_viz
-		type : NamedIndividual/Component/ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/ConceptInstance
-		hasTimeScale : slower_trt
+		type : ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : dashboard_viz
-	anomaly_warning
-		type : NamedIndividual/Component/ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/ConceptInstance
 		hasTimeScale : slower_trt
-		desc : anomaly detection
+	anomaly_warning
+		type : ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : anomaly_warning
+		desc : anomaly detection
+		hasTimeScale : slower_trt
 		providedBy : anomaly_detector
 	real_time_viz
-		type : NamedIndividual/Component/ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/ConceptInstance
-		hasTimeScale : rt
-		desc : 3D visualization of the current state
+		type : ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : real_time_viz
+		desc : 3D visualization of the current state
+		hasTimeScale : rt
 		providedBy : real_time_viz_service
 	dashboard
-		type : NamedIndividual/Component/ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/ConceptInstance
-		hasTimeScale : rt
-		desc : dashboard visualization of the current state and historical data
+		type : ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : dashboard
-	heater_state_estimation
-		type : NamedIndividual/Component/ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/ConceptInstance
+		desc : dashboard visualization of the current state and historical data
 		hasTimeScale : rt
-		desc : state estimation of the heater
+	heater_state_estimation
+		type : ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : heater_state_estimation
+		desc : state estimation of the heater
+		hasTimeScale : rt
 		providedBy : heater_state_estimation_service
 	what_if_sim_results
-		type : NamedIndividual/Component/ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/ConceptInstance
-		hasTimeScale : faster_trt
-		desc :  what-if analysis for future behavior under different controller configurations
+		type : ConnectionComponent/Thing/Insight/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : what_if_sim_results
+		desc :  what-if analysis for future behavior under different controller configurations
+		hasTimeScale : faster_trt
 		providedBy : what_if_sim
 	controller_control
-		type : NamedIndividual/Component/ConnectionComponent/Action/Thing/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/AutomaticEnabledThing/ConceptInstance
-		hasTimeScale : rt
-		desc : control policy updates to the PT
+		type : ConnectionComponent/Action/Thing/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/AutomaticEnabledThing/NamedIndividual/ConceptInstance
 		sameAs : controller_control
+		desc : control policy updates to the PT
+		hasTimeScale : rt
 		providedBy : safe_adaptation/policy_optimization
 	commands
-		type : NamedIndividual/Component/ConnectionComponent/Action/Thing/ContainedElement/DescribedThing/ImplementationThing/ProvidedThing/TimeScaleThing/AutomaticEnabledThing/ConceptInstance
+		type : ConnectionComponent/Action/Thing/ContainedElement/DescribedThing/Component/ImplementationThing/ProvidedThing/TimeScaleThing/AutomaticEnabledThing/NamedIndividual/ConceptInstance
+		sameAs : commands
 		hasTimeScale : rt
 		IsAutomatic : true
-		sameAs : commands
 Data transmitted :
-	controller_state_trans
-		type : NamedIndividual/DataTransmitted/Component/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/AutomaticEnabledThing/ConceptInstance
+	temp_readings_trans
+		type : ConnectionComponent/Thing/DataTransmitted/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/AutomaticEnabledThing/NamedIndividual/ConceptInstance
+		sameAs : temp_readings_trans
 		hasTimeScale : rt
 		IsAutomatic : true
+		asData : temp_readings_streaming
+		producedFrom : temp_sensor_1/temp_sensor_2/temp_sensor_3
+	controller_state_trans
+		type : ConnectionComponent/Thing/DataTransmitted/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/AutomaticEnabledThing/NamedIndividual/ConceptInstance
 		sameAs : controller_state_trans
-		asData : controller_state
-	temp_readings_trans
-		type : NamedIndividual/DataTransmitted/Component/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/AutomaticEnabledThing/ConceptInstance
 		hasTimeScale : rt
-		producedFrom : temp_sensor_1/temp_sensor_2/temp_sensor_3
 		IsAutomatic : true
-		sameAs : temp_readings_trans
-		asData : temp_readings_streaming
+		asData : controller_state
 Sensors :
 	temp_sensor_1
-		type : NamedIndividual/Component/SensingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : ConnectionComponent/Thing/SensingComponent/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : temp_sensor_1
 		producedData : temp_readings_trans
 	temp_sensor_2
-		type : NamedIndividual/Component/SensingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : ConnectionComponent/Thing/SensingComponent/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : temp_sensor_2
 		producedData : temp_readings_trans
 	temp_sensor_3
-		type : NamedIndividual/Component/SensingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
+		type : ConnectionComponent/Thing/SensingComponent/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : temp_sensor_3
 		producedData : temp_readings_trans
 System :
-	controller
-		type : NamedIndividual/ActingComponent/Component/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
-		desc : Controls the fan and heater
-		sameAs : controller
-		isContainedIn : incubator
 	fan
-		type : NamedIndividual/ActingComponent/Component/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
-		desc : Circulates air throughout box
+		type : ActingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : fan
+		desc : Circulates air throughout box
 		isContainedIn : incubator
 	heater
-		type : NamedIndividual/ActingComponent/Component/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
-		desc : Raises the temperature of surrounding air
+		type : ActingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : heater
+		desc : Raises the temperature of surrounding air
+		isContainedIn : incubator
+	controller
+		type : ActingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
+		sameAs : controller
+		desc : Controls the fan and heater
 		isContainedIn : incubator
 	power_supply
-		type : NamedIndividual/ActingComponent/Component/ConnectionComponent/Thing/ContainedElement/DescribedThing/ImplementationThing/TimeScaleThing/ConceptInstance
-		desc : Powers electrical components
+		type : ActingComponent/ConnectionComponent/Thing/ContainedElement/DescribedThing/Component/ImplementationThing/TimeScaleThing/NamedIndividual/ConceptInstance
 		sameAs : power_supply
+		desc : Powers electrical components
 		isContainedIn : incubator
 System environnement :
-	surface
-		type : NamedIndividual/Component/Thing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
-		desc : Where the incubator is placed
-		sameAs : surface
-		isContainedIn : room
 	surrounding_air
-		type : NamedIndividual/Component/Thing/ContainedElement/DescribedThing/ImplementationThing/ConceptInstance
-		desc : Heat sink
+		type : Thing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
 		sameAs : surrounding_air
+		desc : Heat sink
+		isContainedIn : room
+	surface
+		type : Thing/ContainedElement/DescribedThing/Component/ImplementationThing/NamedIndividual/ConceptInstance
+		sameAs : surface
+		desc : Where the incubator is placed
 		isContainedIn : room
 Data :
 	temp_readings_streaming
-		type : NamedIndividual/Component/Thing/DTComponent/Data/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Data/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : temp_readings_streaming
 		inputTo : optimization_algs/dashboard_enabler
 		fromData : temp_readings_trans
 	temp_readings_historical
-		type : NamedIndividual/Component/Thing/DTComponent/Data/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Data/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : temp_readings_historical
 		inputTo : simulator
 	controller_state
-		type : NamedIndividual/Component/Thing/DTComponent/Data/FidelityThing/ContainedElement/DescribedThing/ImplementationThing/Input/ConceptInstance
+		type : Thing/DTComponent/Data/FidelityThing/ContainedElement/DescribedThing/Component/ImplementationThing/Input/NamedIndividual/ConceptInstance
 		sameAs : controller_state
 		fromData : controller_state_trans
 Rabbit exchange :
 	incubator_exchange
-		type : NamedIndividual/ExchangeName/Thing/ConceptInstance
-		exchange_name_str : Incubator_AMQP
+		type : Thing/ExchangeName/NamedIndividual/ConceptInstance
 		sameAs : incubator_exchange
+		exchange_name_str : Incubator_AMQP
 Rabbit route :
 	incubator_routing_key
-		type : NamedIndividual/RoutingKey/Thing/ConceptInstance
-		exchange : incubator_exchange
-		routing_key_str : incubator.record.driver.state
+		type : Thing/RoutingKey/NamedIndividual/ConceptInstance
 		sameAs : incubator_routing_key
+		routing_key_str : incubator.record.driver.state
+		exchange : incubator_exchange
 Rabbit source :
 	incubator_source
-		type : NamedIndividual/Source/Thing/ConceptInstance
+		type : Thing/Source/NamedIndividual/ConceptInstance
+		sameAs : incubator_source
 		routeKey : incubator_routing_key
 		source_str : low_level_driver
-		sameAs : incubator_source
 Rabbit message listener :
 	sensor1ML
-		type : NamedIndividual/MessageListener/Thing/ConceptInstance
-		route : incubator_source
+		type : Thing/MessageListener/NamedIndividual/ConceptInstance
+		sameAs : sensor1ML
 		sourceComponent : temp_sensor_1
 		MLSource : t2
 		MLTarget : temp_sensor_1
-		sameAs : sensor1ML
-	sensor2ML
-		type : NamedIndividual/MessageListener/Thing/ConceptInstance
 		route : incubator_source
+	sensor2ML
+		type : Thing/MessageListener/NamedIndividual/ConceptInstance
+		sameAs : sensor2ML
 		sourceComponent : temp_sensor_2
 		MLSource : t2
 		MLTarget : temp_sensor_2
-		sameAs : sensor2ML
-	sensor3ML
-		type : NamedIndividual/MessageListener/Thing/ConceptInstance
 		route : incubator_source
+	sensor3ML
+		type : Thing/MessageListener/NamedIndividual/ConceptInstance
+		sameAs : sensor3ML
 		sourceComponent : temp_sensor_3
 		MLSource : t3
 		MLTarget : temp_sensor_3
-		sameAs : sensor3ML
\ No newline at end of file
+		route : incubator_source
\ No newline at end of file
diff --git a/website/static/images/architecture.png b/website/static/images/architecture.png
index 7431480..299b12f 100644
Binary files a/website/static/images/architecture.png and b/website/static/images/architecture.png differ
diff --git a/website/themes/my-theme/layouts/partials/characteristics-table.html b/website/themes/my-theme/layouts/partials/characteristics-table.html
index f8a3129..379dfee 100644
--- a/website/themes/my-theme/layouts/partials/characteristics-table.html
+++ b/website/themes/my-theme/layouts/partials/characteristics-table.html
@@ -3,110 +3,110 @@
             <th></th>
             <th>Characteristics</th>
             <th>Description</th>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>1</sub></td>
+			<td class="characteristic-id">C<sub>1</sub></td>
             <td>System under study</td>
             <td>A Styrofoam box containing a lid, a heating element, and fan, controlled by a Raspberry Pi, for incubating tempeh.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>2</sub></td>
+			<td class="characteristic-id">C<sub>2</sub></td>
             <td>Physical acting components</td>
-            <td>controller: Controls the fan and heater<br>fan: Circulates air throughout box<br>heater: Raises the temperature of surrounding air<br>power_supply: Powers electrical components</td>
-        </tr>
+            <td>fan: Circulates air throughout box<br>heater: Raises the temperature of surrounding air<br>controller: Controls the fan and heater<br>power_supply: Powers electrical components</td>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>3</sub></td>
+			<td class="characteristic-id">C<sub>3</sub></td>
             <td>Physical sensing components</td>
             <td>temp_sensor_1<br>temp_sensor_2<br>temp_sensor_3</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>4</sub></td>
+			<td class="characteristic-id">C<sub>4</sub></td>
             <td>Physical-to-virtual interaction</td>
-            <td>controller_state_trans<br>temp_readings_trans</td>
-        </tr>
+            <td>temp_readings_trans<br>controller_state_trans</td>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>5</sub></td>
+			<td class="characteristic-id">C<sub>5</sub></td>
             <td>Virtual-to-physical interaction</td>
             <td>The controller in the PT sends sensor and actuator data on a periodic basis over RabbitMQ.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>6</sub></td>
+			<td class="characteristic-id">C<sub>6</sub></td>
             <td>DT services</td>
             <td>safe_adaptation<br>anomaly_detector<br>real_time_viz_service<br>policy_optimization<br>heater_state_estimation_service<br>what_if_sim</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>7</sub></td>
+			<td class="characteristic-id">C<sub>7</sub></td>
             <td>Twinning time-scale</td>
-            <td>Real-time<br>Slower than real-time<br>The DT-to-PT synchronization occurs every time the PT sends a message to the DT (on a periodic basis).<br>Faster than real-time</td>
-        </tr>
+            <td>Slower than real-time<br>Real-time<br>The DT-to-PT synchronization occurs every time the PT sends a message to the DT (on a periodic basis).<br>Faster than real-time</td>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>8</sub></td>
+			<td class="characteristic-id">C<sub>8</sub></td>
             <td>Multiplicities</td>
             <td>The current implementation has no multiplicities, however, it is possible to deploy multiple DTs for the same PT.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>9</sub></td>
+			<td class="characteristic-id">C<sub>9</sub></td>
             <td>Life-cycle stages</td>
             <td>The DT supports the design and the service phases. In the service phase, it supports creating, executing, saving, analyzing, evolving, and terminating.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>10</sub></td>
+			<td class="characteristic-id">C<sub>10</sub></td>
             <td>DT models and data</td>
-            <td>Model:<br>four_para_model<br>pt_model<br>ANN_state_estimation_model<br>ANN_model<br>two_para_model<br>controller_model<br>env_model<br>pt_and_env_model<br><br>Data:<br>temp_readings_streaming<br>temp_readings_historical<br>controller_state</td>
-        </tr>
+            <td>Model:<br>pt_model<br>ANN_state_estimation_model<br>ANN_model<br>four_para_model<br>two_para_model<br>controller_model<br>env_model<br>pt_and_env_model<br><br>Data:<br>temp_readings_streaming<br>temp_readings_historical<br>controller_state</td>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>11</sub></td>
+			<td class="characteristic-id">C<sub>11</sub></td>
             <td>Tooling and enablers</td>
             <td>simulator<br>state_estimator<br>anomaly_detector_enabler<br>optimization_algs<br>dashboard_enabler<br>godot<br>docker<br>influx_db<br>rabbit_mq</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>12</sub></td>
+			<td class="characteristic-id">C<sub>12</sub></td>
             <td>DT constellation</td>
             <td>The orchestration of the system-as-a-whole is carried out by micro-services. These microservices set up the multiple components from configuration files, including the models and data, tools and enablers, services, and physical-to-virtual and virtual-to-physical interaction. It is possible to leave aside some of the micro-services when initializing the DT for testing purposes..</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>13</sub></td>
+			<td class="characteristic-id">C<sub>13</sub></td>
             <td>Twinning process and DT evolution</td>
             <td>The DT was engineered based on a joint engineering approach. For the evolution, 10 milestones have been defined: identifying the physics for the PT, building the plant models with, characterizing the heating power, building the first physical prototype, experimentally refining the parameters for the plant model, creating the controller model, deploying the controller code into the physical controller, deploying the visualization service, providing services for state estimation and anomaly detection, and providing the service for optimizing the control policy.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>14</sub></td>
+			<td class="characteristic-id">C<sub>14</sub></td>
             <td>Fidelity and validity considerations</td>
             <td>The models have been calibrated against experimental data and the predictive accuracy of the best model is within 2°C. The models have been validated in a controlled environment.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>15</sub></td>
+			<td class="characteristic-id">C<sub>15</sub></td>
             <td>DT technical connection</td>
             <td>The PT-to-DT connection is done over Wi-Fi on a laptop using RabbitMQ.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>16</sub></td>
+			<td class="characteristic-id">C<sub>16</sub></td>
             <td>DT hosting/deployment</td>
             <td>The Incubator DT is deployed locally on a LAN.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>17</sub></td>
+			<td class="characteristic-id">C<sub>17</sub></td>
             <td>Insights and decision making</td>
             <td>dashboard_viz<br>anomaly_warning: anomaly detection<br>real_time_viz: 3D visualization of the current state<br>dashboard: dashboard visualization of the current state and historical data<br>heater_state_estimation: state estimation of the heater<br>what_if_sim_results:  what-if analysis for future behavior under different controller configurations<br>controller_control: control policy updates to the PT<br>commands</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>18</sub></td>
+			<td class="characteristic-id">C<sub>18</sub></td>
             <td>Horizontal integration</td>
             <td>There is horizontal integration with the micro-services of the Incubator DT. The DT is able to exchange information with other information systems over RabbitMQ.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>19</sub></td>
+			<td class="characteristic-id">C<sub>19</sub></td>
             <td>Data ownership and privacy</td>
             <td>Datasets have been provided online to the public. No privacy-related data are stored.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>20</sub></td>
+			<td class="characteristic-id">C<sub>20</sub></td>
             <td>Standardization</td>
             <td>Communication is carried out using AMQP standard via RabbitMQ. Behavioral models have been produced following the FMI standard version 2.</td>
-        </tr>
+		</tr>
         <tr>
-            <td class="characteristic-id">C<sub>21</sub></td>
+			<td class="characteristic-id">C<sub>21</sub></td>
             <td>Security and safety considerations</td>
             <td>Communication can be TLS encrypted through the RabbitMQ broker. The physical controller counts with a safety consideration that turns off system if the temperature read is above 60°C or if the network connection is unstable.</td>
-        </tr>
+		</tr>
     </table>
\ No newline at end of file