diff --git a/li.strolch.model/src/main/java/li/strolch/model/Tags.java b/li.strolch.model/src/main/java/li/strolch/model/Tags.java
index 070ea63d4..33b9277fa 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/Tags.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/Tags.java
@@ -78,6 +78,8 @@ public class Tags {
 		public static final String NAME = "name";
 		public static final String DATE = "date";
 		public static final String STATE = "state";
+		public static final String START = "start";
+		public static final String END = "end";
 		public static final String TIME_ORDERING = "timeOrdering";
 
 		public static final String PARAMETER_BAGS = "parameterBags";
@@ -90,7 +92,7 @@ public class Tags {
 		public static final String TIMED_STATES = "timedStates";
 		public static final String VALUES = "values";
 
-		public static final String ACTION = "action";
+		public static final String ACTION = "Action";
 		public static final String RESOURCE_ID = "resourceId";
 		public static final String RESOURCE_TYPE = "resourceType";
 		public static final String VALUE_CHANGES = "valueChanges";
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
index 9b89fc201..821f64a91 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
@@ -1,5 +1,6 @@
 package li.strolch.model.json;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.SortedSet;
@@ -52,7 +53,7 @@ public class StrolchElementToJsonVisitor {
 		rootJ.addProperty(Tags.Json.OBJECT_TYPE, Tags.Json.ORDER);
 
 		toJson(element, rootJ);
-		rootJ.addProperty(Tags.Json.DATE, ISO8601FormatFactory.getInstance().formatDate(element.getDate()));
+		rootJ.addProperty(Tags.Json.DATE, formatDate(element.getDate()));
 		rootJ.addProperty(Tags.Json.STATE, element.getState().getName());
 
 		addVersion(element, rootJ);
@@ -79,6 +80,8 @@ public class StrolchElementToJsonVisitor {
 
 		rootJ.addProperty(Tags.Json.TIME_ORDERING, element.getTimeOrdering().getName());
 		rootJ.addProperty(Tags.Json.STATE, element.getState().getName());
+		rootJ.addProperty(Tags.Json.START, formatDate(element.getStart()));
+		rootJ.addProperty(Tags.Json.END, formatDate(element.getEnd()));
 
 		toJson((AbstractStrolchElement) element, rootJ);
 
@@ -119,6 +122,8 @@ public class StrolchElementToJsonVisitor {
 		rootJ.addProperty(Tags.Json.RESOURCE_ID, element.getResourceId());
 		rootJ.addProperty(Tags.Json.RESOURCE_TYPE, element.getResourceType());
 		rootJ.addProperty(Tags.Json.STATE, element.getState().getName());
+		rootJ.addProperty(Tags.Json.START, formatDate(element.getStart()));
+		rootJ.addProperty(Tags.Json.END, formatDate(element.getEnd()));
 
 		addParameterBags(element, rootJ);
 		addPolicies(element, rootJ);
@@ -136,8 +141,7 @@ public class StrolchElementToJsonVisitor {
 				JsonObject changeJ = new JsonObject();
 
 				changeJ.addProperty(Tags.Json.STATE_ID, valueChange.getStateId());
-				changeJ.addProperty(Tags.Json.TIME,
-						ISO8601FormatFactory.getInstance().formatDate(valueChange.getTime()));
+				changeJ.addProperty(Tags.Json.TIME, formatDate(valueChange.getTime()));
 				changeJ.addProperty(Tags.Json.VALUE, valueChange.getValue().getValueAsString());
 				changeJ.addProperty(Tags.Json.TYPE, valueChange.getValue().getType());
 
@@ -148,6 +152,14 @@ public class StrolchElementToJsonVisitor {
 		return rootJ;
 	}
 
+	private String formatDate(Date date) {
+		return ISO8601FormatFactory.getInstance().formatDate(date);
+	}
+
+	private String formatDate(Long timestamp) {
+		return ISO8601FormatFactory.getInstance().formatDate(timestamp);
+	}
+
 	protected void addPolicies(PolicyContainer policyContainer, JsonObject rootJ) {
 		if (!policyContainer.hasPolicyDefs() || !policyContainer.getPolicyDefs().hasPolicyDefs())
 			return;
@@ -247,7 +259,7 @@ public class StrolchElementToJsonVisitor {
 				Long time = value.getTime();
 				String valueS = value.getValue().getValueAsString();
 
-				valueJ.addProperty(Tags.Json.TIME, ISO8601FormatFactory.getInstance().formatDate(time));
+				valueJ.addProperty(Tags.Json.TIME, formatDate(time));
 				valueJ.addProperty(Tags.Json.VALUE, valueS);
 			}
 		}
@@ -262,8 +274,7 @@ public class StrolchElementToJsonVisitor {
 		JsonObject versionJ = new JsonObject();
 		versionJ.addProperty(Tags.Json.VERSION, version.getVersion());
 		versionJ.addProperty(Tags.Json.CREATED_BY, version.getCreatedBy());
-		versionJ.addProperty(Tags.Json.CREATED_AT,
-				ISO8601FormatFactory.getInstance().formatDate(version.getCreatedAt()));
+		versionJ.addProperty(Tags.Json.CREATED_AT, formatDate(version.getCreatedAt()));
 		versionJ.addProperty(Tags.Json.DELETED, version.isDeleted());
 		rootJ.add(Tags.Json.VERSION, versionJ);
 	}
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
index 72889f61d..5aff3cd37 100644
--- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
+++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
@@ -377,6 +377,7 @@ public class Inspector {
 			for (Resource resource : byType) {
 
 				JsonObject elementJ = new JsonObject();
+				elementJ.addProperty(Tags.Json.OBJECT_TYPE, Tags.RESOURCE);
 				elementJ.addProperty(Tags.Json.ID, resource.getId());
 				elementJ.addProperty(Tags.Json.NAME, resource.getName());
 				elementJ.addProperty(Tags.Json.TYPE, resource.getType());
@@ -423,6 +424,7 @@ public class Inspector {
 			for (Order order : byType) {
 
 				JsonObject elementJ = new JsonObject();
+				elementJ.addProperty(Tags.Json.OBJECT_TYPE, Tags.ORDER);
 				elementJ.addProperty(Tags.Json.ID, order.getId());
 				elementJ.addProperty(Tags.Json.NAME, order.getName());
 				elementJ.addProperty(Tags.Json.TYPE, order.getType());
@@ -457,6 +459,7 @@ public class Inspector {
 			for (Activity activity : byType) {
 
 				JsonObject elementJ = new JsonObject();
+				elementJ.addProperty(Tags.Json.OBJECT_TYPE, Tags.ACTIVITY);
 				elementJ.addProperty(Tags.Json.ID, activity.getId());
 				elementJ.addProperty(Tags.Json.NAME, activity.getName());
 				elementJ.addProperty(Tags.Json.TYPE, activity.getType());