diff --git a/backend/lib/Definition/EntityDefinition.json b/backend/lib/Definition/EntityDefinition.json
index 6c1e8ac..2f94ecb 100644
--- a/backend/lib/Definition/EntityDefinition.json
+++ b/backend/lib/Definition/EntityDefinition.json
@@ -29,7 +29,7 @@
 	{
 		"name"			: "group",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"interpreter"	: "Volkszaehler\\Interpreter\\AggregatorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Aggregator",
@@ -38,7 +38,7 @@
 	{
 		"name"			: "user",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "tolerance", "active"],
 		"icon"			: "",				// TODO look for an icon
 		"interpreter"	: "Volkszaehler\\Interpreter\\AggregatorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Aggregator",
@@ -47,7 +47,7 @@
 	{
 		"name"			: "power",
 		"required"		: ["title", "resolution"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "kW/h",
 		"interpreter"	: "Volkszaehler\\Interpreter\\MeterInterpreter",
@@ -57,7 +57,7 @@
 	{
 		"name"			: "gas",
 		"required"		: ["title", "resolution"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "m³/h",
 		"interpreter"	: "Volkszaehler\\Interpreter\\MeterInterpreter",
@@ -67,7 +67,7 @@
 	{
 		"name"			: "water",
 		"required"		: ["title", "resolution"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "m³/h",
 		"interpreter"	: "Volkszaehler\\Interpreter\\MeterInterpreter",
@@ -77,7 +77,7 @@
 	{
 		"name"			: "temperature",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "°C",
 		"interpreter"	: "Volkszaehler\\Interpreter\\SensorInterpreter",
@@ -87,7 +87,7 @@
 	{
 		"name"			: "pressure",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "hPa",
 		"interpreter"	: "Volkszaehler\\Interpreter\\SensorInterpreter",
@@ -97,7 +97,7 @@
 	{
 		"name"			: "humidity",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "%",
 		"interpreter"	: "Volkszaehler\\Interpreter\\SensorInterpreter",
@@ -107,7 +107,7 @@
 	{
 		"name"			: "windspeed",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "km/h",
 		"interpreter"	: "Volkszaehler\\Interpreter\\SensorInterpreter",
@@ -117,7 +117,7 @@
 	{
 		"name"			: "radition",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "",					// TODO add unit
 		"interpreter"	: "Volkszaehler\\Interpreter\\SensorInterpreter",
@@ -127,7 +127,7 @@
 	{
 		"name"			: "luminosity",
 		"required"		: ["title"],
-		"optional"		: ["description", "details:", "owner:", "address:", "tolerance"],
+		"optional"		: ["description", "details:", "owner:", "address:", "tolerance", "public", "active"],
 		"icon"			: "",					// TODO look for an icon
 		"unit"			: "",					// TODO add unit
 		"interpreter"	: "Volkszaehler\\Interpreter\\SensorInterpreter",
diff --git a/backend/lib/Definition/PropertyDefinition.json b/backend/lib/Definition/PropertyDefinition.json
index d6e3038..ac87fba 100644
--- a/backend/lib/Definition/PropertyDefinition.json
+++ b/backend/lib/Definition/PropertyDefinition.json
@@ -38,9 +38,19 @@
 		"name"			: "description",
 		"type"			: "text",
 		"pattern"		: "/[a-z0-9 ]/",	// TODO add whitespaces as \t \n \r
-		"max"			: 255,				// TODO allowed column size in database?
+		"max"			: 255,			// TODO allowed column size in database?
 		"translation"	: { "de" : "Beschreibung" }
 	},
+	{
+		"name"			: "public",
+		"type"			: "boolean",
+		"translation"	: { "de" : "Öffentlich" }
+	},
+	{
+		"name"			: "active",
+		"type"			: "boolean",
+		"translation"	: { "de" : "Aktiv?" }
+	},
 	{
 		"name"			: "cost",
 		"type"			: "float",
@@ -309,10 +319,5 @@
 		"type"			: "string",
 		"max"			: 6,
 		"translation"	: { "de" : "Controller Pin" }
-	},
-	{
-		"name"			: "active",
-		"type"			: "boolean",
-		"translation"	: { "de" : "Aktiv?" }
 	}
 ]