diff --git a/broid-schemas/Makefile b/broid-schemas/Makefile
index 9f35fa1c..a127234f 100644
--- a/broid-schemas/Makefile
+++ b/broid-schemas/Makefile
@@ -20,4 +20,4 @@ prepare:
 
 %.json: %.yaml prepare
 	@echo Building $@
-	(echo "id: '$(BASE_URL)$(subst src/schemas/,,$@)'"; cat $<) | js-yaml | json-minify > lib/$(subst src/,,$@)
+	(echo "id: '$(BASE_URL)$(subst src/schemas/,,$@)'"; cat $<) | js-yaml | json-minify | js-beautify -s 2 -b end-expand > lib/$(subst src/,,$@)
diff --git a/broid-schemas/lib/schemas/activity.json b/broid-schemas/lib/schemas/activity.json
index 3aef1826..291349f8 100644
--- a/broid-schemas/lib/schemas/activity.json
+++ b/broid-schemas/lib/schemas/activity.json
@@ -1 +1,59 @@
-{"id":"http://schemas.broid.ai/activity.json","type":"object","properties":{"@context":{"type":"string","enum":["https://www.w3.org/ns/activitystreams"]},"type":{"type":"string","enum":["Create","Update","Delete"]},"published":{"type":"number","pattern":"(\\d+(?:\\.\\d*)?|\\.\\d+)\\s+(\\S+)"},"generator":{"$ref":"http://schemas.broid.ai/embedded/generator.json"},"actor":{"$ref":"http://schemas.broid.ai/embedded/actor.json","required":["id","type"]},"target":{"oneOf":[{"$ref":"http://schemas.broid.ai/embedded/actor.json","required":["id","type"]},{"$ref":"http://schemas.broid.ai/embedded/group.json","required":["id","type"]}]},"cc":{"oneOf":[{"$ref":"http://schemas.broid.ai/embedded/actor.json","required":["id","type"]},{"$ref":"http://schemas.broid.ai/embedded/group.json","required":["id","type"]}]},"object":{"oneOf":[{"$ref":"http://schemas.broid.ai/object/note.json","required":["type","id","content"]},{"$ref":"http://schemas.broid.ai/object/media.json","required":["type","id","url"]},{"$ref":"http://schemas.broid.ai/object/place.json","required":["type","id","latitude","longitude"]}]}},"required":["type","published","generator","actor","target","object"]}
+{
+  "id": "http://schemas.broid.ai/activity.json",
+  "type": "object",
+  "properties": {
+    "@context": {
+      "type": "string",
+      "enum": ["https://www.w3.org/ns/activitystreams"]
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Create", "Update", "Delete"]
+    },
+    "published": {
+      "type": "number",
+      "pattern": "(\\d+(?:\\.\\d*)?|\\.\\d+)\\s+(\\S+)"
+    },
+    "generator": {
+      "$ref": "http://schemas.broid.ai/embedded/generator.json"
+    },
+    "actor": {
+      "$ref": "http://schemas.broid.ai/embedded/actor.json",
+      "required": ["id", "type"]
+    },
+    "target": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/embedded/actor.json",
+        "required": ["id", "type"]
+      }, {
+        "$ref": "http://schemas.broid.ai/embedded/group.json",
+        "required": ["id", "type"]
+      }]
+    },
+    "cc": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/embedded/actor.json",
+        "required": ["id", "type"]
+      }, {
+        "$ref": "http://schemas.broid.ai/embedded/group.json",
+        "required": ["id", "type"]
+      }]
+    },
+    "object": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/object/note.json",
+        "required": ["type", "id", "content"]
+      }, {
+        "$ref": "http://schemas.broid.ai/object/media.json",
+        "required": ["type", "id", "url"]
+      }, {
+        "$ref": "http://schemas.broid.ai/object/place.json",
+        "required": ["type", "id", "latitude", "longitude"]
+      }, {
+        "$ref": "http://schemas.broid.ai/object/collection.json",
+        "required": ["type", "items"]
+      }]
+    }
+  },
+  "required": ["type", "published", "generator", "actor", "target", "object"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/embedded/actor.json b/broid-schemas/lib/schemas/embedded/actor.json
index 8e3e8ada..7503d726 100644
--- a/broid-schemas/lib/schemas/embedded/actor.json
+++ b/broid-schemas/lib/schemas/embedded/actor.json
@@ -1 +1,17 @@
-{"id":"http://schemas.broid.ai/embedded/actor.json","type":"object","properties":{"id":{"type":"string"},"type":{"type":"string","enum":["Person","Bot","Application"]},"name":{"type":"string"}},"required":["type"]}
+{
+  "id": "http://schemas.broid.ai/embedded/actor.json",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Person", "Bot", "Application"]
+    },
+    "name": {
+      "type": "string"
+    }
+  },
+  "required": ["type"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/embedded/generator.json b/broid-schemas/lib/schemas/embedded/generator.json
index 4d070f56..80084b75 100644
--- a/broid-schemas/lib/schemas/embedded/generator.json
+++ b/broid-schemas/lib/schemas/embedded/generator.json
@@ -1 +1,17 @@
-{"id":"http://schemas.broid.ai/embedded/generator.json","type":"object","properties":{"id":{"type":"string"},"type":{"type":"string","enum":["Service"]},"name":{"type":"string"}},"required":["id","type","name"]}
+{
+  "id": "http://schemas.broid.ai/embedded/generator.json",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Service"]
+    },
+    "name": {
+      "type": "string"
+    }
+  },
+  "required": ["id", "type", "name"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/embedded/group.json b/broid-schemas/lib/schemas/embedded/group.json
index 2533f323..7f5d6bea 100644
--- a/broid-schemas/lib/schemas/embedded/group.json
+++ b/broid-schemas/lib/schemas/embedded/group.json
@@ -1 +1,17 @@
-{"id":"http://schemas.broid.ai/embedded/group.json","type":"object","properties":{"id":{"type":"string"},"type":{"type":"string","enum":["Group"]},"name":{"type":"string"}},"required":["type"]}
+{
+  "id": "http://schemas.broid.ai/embedded/group.json",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Group"]
+    },
+    "name": {
+      "type": "string"
+    }
+  },
+  "required": ["type"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/embedded/tag.json b/broid-schemas/lib/schemas/embedded/tag.json
index 555e65a4..8ab1f0b7 100644
--- a/broid-schemas/lib/schemas/embedded/tag.json
+++ b/broid-schemas/lib/schemas/embedded/tag.json
@@ -1 +1,17 @@
-{"id":"http://schemas.broid.ai/embedded/tag.json","type":"object","properties":{"id":{"type":"string"},"name":{"type":"string"},"type":{"type":"string"}},"required":["id","type","name"]}
+{
+  "id": "http://schemas.broid.ai/embedded/tag.json",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Object"]
+    }
+  },
+  "required": ["id", "type", "name"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/index.json b/broid-schemas/lib/schemas/index.json
index 067a649c..42798901 100644
--- a/broid-schemas/lib/schemas/index.json
+++ b/broid-schemas/lib/schemas/index.json
@@ -5,6 +5,7 @@
   "embedded/group",
   "embedded/tag",
   "object/collection",
+  "object/context",
   "object/media",
   "object/note",
   "object/object",
diff --git a/broid-schemas/lib/schemas/object/collection.json b/broid-schemas/lib/schemas/object/collection.json
index d25c88c7..44e8ca6c 100644
--- a/broid-schemas/lib/schemas/object/collection.json
+++ b/broid-schemas/lib/schemas/object/collection.json
@@ -1 +1,26 @@
-{"id":"http://schemas.broid.ai/object/collection.json","type":"object","properties":{"type":{"type":"string","enum":["Collection"]},"name":{"type":"string"},"content":{"type":"string"},"totalItems":{"type":"number"},"items":{"type":"array","items":{"oneOf":[{"$ref":"http://schemas.broid.ai/object/note.json","required":["type","content"]},{"$ref":"http://schemas.broid.ai/object/media.json","required":["type","url"]},{"$ref":"http://schemas.broid.ai/object/place.json","required":["type","latitude","longitude"]}]}}},"required":["type","items"]}
+{
+  "id": "http://schemas.broid.ai/object/collection.json",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "enum": ["Collection"]
+    },
+    "name": {
+      "type": "string"
+    },
+    "content": {
+      "type": "string"
+    },
+    "totalItems": {
+      "type": "number"
+    },
+    "items": {
+      "type": "array",
+      "items": {
+        "$ref": "http://schemas.broid.ai/object/media.json"
+      }
+    }
+  },
+  "required": ["type", "items"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/object/context.json b/broid-schemas/lib/schemas/object/context.json
new file mode 100644
index 00000000..3cac885b
--- /dev/null
+++ b/broid-schemas/lib/schemas/object/context.json
@@ -0,0 +1,20 @@
+{
+  "id": "http://schemas.broid.ai/object/context.json",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Object"]
+    },
+    "name": {
+      "type": "string"
+    },
+    "content": {
+      "type": "string"
+    }
+  },
+  "required": ["type", "content"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/object/media.json b/broid-schemas/lib/schemas/object/media.json
index 5f6735cd..00a97a4c 100644
--- a/broid-schemas/lib/schemas/object/media.json
+++ b/broid-schemas/lib/schemas/object/media.json
@@ -1 +1,51 @@
-{"id":"http://schemas.broid.ai/object/media.json","type":"object","properties":{"type":{"type":"string","enum":["Audio","Image","Video"]},"id":{"type":"string"},"name":{"type":"string"},"content":{"type":"string"},"url":{"type":"string","format":"uri"},"preview":{"type":"string","format":"uri"},"mediaType":{"type":"string"},"context":{"oneOf":[{"$ref":"http://schemas.broid.ai/object/object.json"},{"type":"array","items":{"$ref":"http://schemas.broid.ai/object/object.json"}}]},"tag":{"oneOf":[{"$ref":"http://schemas.broid.ai/embedded/tag.json"},{"type":"array","items":{"$ref":"http://schemas.broid.ai/embedded/tag.json"}}]}},"required":["type","url"]}
+{
+  "id": "http://schemas.broid.ai/object/media.json",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "enum": ["Audio", "Image", "Video", "Document"]
+    },
+    "id": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "content": {
+      "type": "string"
+    },
+    "url": {
+      "type": "string",
+      "format": "uri"
+    },
+    "preview": {
+      "type": "string",
+      "format": "uri"
+    },
+    "mediaType": {
+      "type": "string"
+    },
+    "context": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/object/context.json"
+      }, {
+        "type": "array",
+        "items": {
+          "$ref": "http://schemas.broid.ai/object/context.json"
+        }
+      }]
+    },
+    "tag": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/embedded/tag.json"
+      }, {
+        "type": "array",
+        "items": {
+          "$ref": "http://schemas.broid.ai/embedded/tag.json"
+        }
+      }]
+    }
+  },
+  "required": ["type", "url"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/object/note.json b/broid-schemas/lib/schemas/object/note.json
index 3678b208..47698836 100644
--- a/broid-schemas/lib/schemas/object/note.json
+++ b/broid-schemas/lib/schemas/object/note.json
@@ -1 +1,40 @@
-{"id":"http://schemas.broid.ai/object/note.json","type":"object","properties":{"type":{"type":"string","enum":["Note"]},"id":{"type":"string"},"name":{"type":"string"},"content":{"type":"string"},"context":{"oneOf":[{"$ref":"http://schemas.broid.ai/object/object.json"},{"type":"array","items":{"$ref":"http://schemas.broid.ai/object/object.json"}}]},"tag":{"oneOf":[{"$ref":"http://schemas.broid.ai/embedded/tag.json"},{"type":"array","items":{"$ref":"http://schemas.broid.ai/embedded/tag.json"}}]}},"required":["type","content"]}
+{
+  "id": "http://schemas.broid.ai/object/note.json",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "enum": ["Note"]
+    },
+    "id": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "content": {
+      "type": "string"
+    },
+    "context": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/object/context.json"
+      }, {
+        "type": "array",
+        "items": {
+          "$ref": "http://schemas.broid.ai/object/context.json"
+        }
+      }]
+    },
+    "tag": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/embedded/tag.json"
+      }, {
+        "type": "array",
+        "items": {
+          "$ref": "http://schemas.broid.ai/embedded/tag.json"
+        }
+      }]
+    }
+  },
+  "required": ["type", "content"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/object/object.json b/broid-schemas/lib/schemas/object/object.json
index 036066b1..ada42ea1 100644
--- a/broid-schemas/lib/schemas/object/object.json
+++ b/broid-schemas/lib/schemas/object/object.json
@@ -1 +1,14 @@
-{"id":"http://schemas.broid.ai/object/object.json","type":"object","properties":{"type":{"type":"string","enum":["Object"]},"name":{"type":"string"},"content":{"type":"string"}},"required":["type","content"]}
+{
+  "id": "http://schemas.broid.ai/object/object.json",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Note", "Image", "Video", "Audio", "Place", "Document"]
+    }
+  },
+  "required": ["id", "type"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/object/place.json b/broid-schemas/lib/schemas/object/place.json
index ae74b7aa..b7c4194b 100644
--- a/broid-schemas/lib/schemas/object/place.json
+++ b/broid-schemas/lib/schemas/object/place.json
@@ -1 +1,46 @@
-{"id":"http://schemas.broid.ai/object/place.json","type":"object","properties":{"type":{"type":"string","enum":["Place"]},"id":{"type":"string"},"name":{"type":"string"},"content":{"type":"string"},"latitude":{"type":"number"},"longitude":{"type":"number"},"context":{"oneOf":[{"$ref":"http://schemas.broid.ai/object/object.json"},{"type":"array","items":{"$ref":"http://schemas.broid.ai/object/object.json"}}]},"tag":{"oneOf":[{"$ref":"http://schemas.broid.ai/embedded/tag.json"},{"type":"array","items":{"$ref":"http://schemas.broid.ai/embedded/tag.json"}}]}},"required":["type","latitude","longitude"]}
+{
+  "id": "http://schemas.broid.ai/object/place.json",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "enum": ["Place"]
+    },
+    "id": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "content": {
+      "type": "string"
+    },
+    "latitude": {
+      "type": "number"
+    },
+    "longitude": {
+      "type": "number"
+    },
+    "context": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/object/context.json"
+      }, {
+        "type": "array",
+        "items": {
+          "$ref": "http://schemas.broid.ai/object/context.json"
+        }
+      }]
+    },
+    "tag": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/embedded/tag.json"
+      }, {
+        "type": "array",
+        "items": {
+          "$ref": "http://schemas.broid.ai/embedded/tag.json"
+        }
+      }]
+    }
+  },
+  "required": ["type", "latitude", "longitude"]
+}
\ No newline at end of file
diff --git a/broid-schemas/lib/schemas/send.json b/broid-schemas/lib/schemas/send.json
index 689713cc..b241b2ad 100644
--- a/broid-schemas/lib/schemas/send.json
+++ b/broid-schemas/lib/schemas/send.json
@@ -1 +1,42 @@
-{"id":"http://schemas.broid.ai/send.json","type":"object","properties":{"@context":{"type":"string","enum":["https://www.w3.org/ns/activitystreams"]},"type":{"type":"string","enum":["Create","Update","Delete"]},"generator":{"$ref":"http://schemas.broid.ai/embedded/generator.json"},"to":{"oneOf":[{"$ref":"http://schemas.broid.ai/embedded/actor.json","required":["id","type"]},{"$ref":"http://schemas.broid.ai/embedded/group.json","required":["id","type"]}]},"object":{"oneOf":[{"$ref":"http://schemas.broid.ai/object/note.json","required":["type","content"]},{"$ref":"http://schemas.broid.ai/object/media.json","required":["type","url"]},{"$ref":"http://schemas.broid.ai/object/place.json","required":["type","latitude","longitude"]},{"$ref":"http://schemas.broid.ai/object/collection.json","required":["type","items"]}]}},"required":["type","generator","to","object"]}
+{
+  "id": "http://schemas.broid.ai/send.json",
+  "type": "object",
+  "properties": {
+    "@context": {
+      "type": "string",
+      "enum": ["https://www.w3.org/ns/activitystreams"]
+    },
+    "type": {
+      "type": "string",
+      "enum": ["Create", "Update", "Delete"]
+    },
+    "generator": {
+      "$ref": "http://schemas.broid.ai/embedded/generator.json"
+    },
+    "to": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/embedded/actor.json",
+        "required": ["id", "type"]
+      }, {
+        "$ref": "http://schemas.broid.ai/embedded/group.json",
+        "required": ["id", "type"]
+      }]
+    },
+    "object": {
+      "oneOf": [{
+        "$ref": "http://schemas.broid.ai/object/note.json",
+        "required": ["type", "content"]
+      }, {
+        "$ref": "http://schemas.broid.ai/object/media.json",
+        "required": ["type", "url"]
+      }, {
+        "$ref": "http://schemas.broid.ai/object/place.json",
+        "required": ["type", "latitude", "longitude"]
+      }, {
+        "$ref": "http://schemas.broid.ai/object/collection.json",
+        "required": ["type", "items"]
+      }]
+    }
+  },
+  "required": ["type", "generator", "to", "object"]
+}
\ No newline at end of file
diff --git a/broid-schemas/package.json b/broid-schemas/package.json
index f7a3a4f1..57230c5f 100644
--- a/broid-schemas/package.json
+++ b/broid-schemas/package.json
@@ -51,6 +51,7 @@
     "concurrently": "^3.1.0",
     "js-yaml": "^3.8.1",
     "json-minify": "^1.0.0",
+    "js-beautify": "^1.6.14",
     "nsp": "^2.6.3",
     "tslint": "^4.4.2",
     "tslint-eslint-rules": "^3.5.1",
diff --git a/broid-schemas/src/schemas/activity.yaml b/broid-schemas/src/schemas/activity.yaml
index 77b7bcf2..2b631d06 100644
--- a/broid-schemas/src/schemas/activity.yaml
+++ b/broid-schemas/src/schemas/activity.yaml
@@ -34,4 +34,6 @@ properties:
         required: [ type, id, url ]
       - $ref: "http://schemas.broid.ai/object/place.json"
         required: [ type, id, latitude, longitude ]
+      - $ref: "http://schemas.broid.ai/object/collection.json"
+        required: [ type, items ]
 required: [ type, published, generator, actor, target, object ]
diff --git a/broid-schemas/src/schemas/embedded/tag.yaml b/broid-schemas/src/schemas/embedded/tag.yaml
index 03114f7c..a54d614e 100644
--- a/broid-schemas/src/schemas/embedded/tag.yaml
+++ b/broid-schemas/src/schemas/embedded/tag.yaml
@@ -6,4 +6,5 @@ properties:
     type: string
   type:
     type: string
+    enum: [ Object ]
 required: [ id, type, name ]
diff --git a/broid-schemas/src/schemas/index.yaml b/broid-schemas/src/schemas/index.yaml
index ead8fda4..9742b8f4 100644
--- a/broid-schemas/src/schemas/index.yaml
+++ b/broid-schemas/src/schemas/index.yaml
@@ -4,6 +4,7 @@
 - embedded/group
 - embedded/tag
 - object/collection
+- object/context
 - object/media
 - object/note
 - object/object
diff --git a/broid-schemas/src/schemas/object/collection.yaml b/broid-schemas/src/schemas/object/collection.yaml
index 05a3aa6a..0b668419 100644
--- a/broid-schemas/src/schemas/object/collection.yaml
+++ b/broid-schemas/src/schemas/object/collection.yaml
@@ -11,12 +11,5 @@ properties:
     type: number
   items:
     type: array
-    items:
-      oneOf:
-        - $ref: "http://schemas.broid.ai/object/note.json"
-          required: [ type, content ]
-        - $ref: "http://schemas.broid.ai/object/media.json"
-          required: [ type, url ]
-        - $ref: "http://schemas.broid.ai/object/place.json"
-          required: [ type, latitude, longitude ]
+    items: { $ref: "http://schemas.broid.ai/object/media.json" }
 required: [ type, items ]
diff --git a/broid-schemas/src/schemas/object/context.yaml b/broid-schemas/src/schemas/object/context.yaml
new file mode 100644
index 00000000..9704153c
--- /dev/null
+++ b/broid-schemas/src/schemas/object/context.yaml
@@ -0,0 +1,12 @@
+type: object
+properties:
+  id:
+    type: string
+  type:
+    type: string
+    enum: [ Object ]
+  name:
+    type: string
+  content:
+    type: string
+required: [ type, content ]
diff --git a/broid-schemas/src/schemas/object/media.yaml b/broid-schemas/src/schemas/object/media.yaml
index 972dad3f..1bc2d993 100644
--- a/broid-schemas/src/schemas/object/media.yaml
+++ b/broid-schemas/src/schemas/object/media.yaml
@@ -2,7 +2,7 @@ type: object
 properties:
   type:
     type: string
-    enum: [ Audio, Image, Video ]
+    enum: [ Audio, Image, Video, Document ]
   id:
     type: string
   name:
@@ -19,8 +19,8 @@ properties:
     type: string
   context:
     oneOf:
-      - $ref: "http://schemas.broid.ai/object/object.json"
-      - { type: array, items: { $ref: "http://schemas.broid.ai/object/object.json" } }
+      - $ref: "http://schemas.broid.ai/object/context.json"
+      - { type: array, items: { $ref: "http://schemas.broid.ai/object/context.json" } }
   tag:
     oneOf:
       - $ref: "http://schemas.broid.ai/embedded/tag.json"
diff --git a/broid-schemas/src/schemas/object/note.yaml b/broid-schemas/src/schemas/object/note.yaml
index 167be81f..3965682f 100644
--- a/broid-schemas/src/schemas/object/note.yaml
+++ b/broid-schemas/src/schemas/object/note.yaml
@@ -11,8 +11,8 @@ properties:
     type: string
   context:
     oneOf:
-      - $ref: "http://schemas.broid.ai/object/object.json"
-      - { type: array, items: { $ref: "http://schemas.broid.ai/object/object.json" } }
+      - $ref: "http://schemas.broid.ai/object/context.json"
+      - { type: array, items: { $ref: "http://schemas.broid.ai/object/context.json" } }
   tag:
     oneOf:
       - $ref: "http://schemas.broid.ai/embedded/tag.json"
diff --git a/broid-schemas/src/schemas/object/object.yaml b/broid-schemas/src/schemas/object/object.yaml
index 4e79b27c..55cfa911 100644
--- a/broid-schemas/src/schemas/object/object.yaml
+++ b/broid-schemas/src/schemas/object/object.yaml
@@ -1,10 +1,8 @@
 type: object
 properties:
-  type:
-    type: string
-    enum: [ Object ]
-  name:
+  id:
     type: string
-  content:
+  type:
     type: string
-required: [ type, content ]
+    enum: [ Note, Image, Video, Audio, Place, Document ]
+required: [ id, type ]
diff --git a/broid-schemas/src/schemas/object/place.yaml b/broid-schemas/src/schemas/object/place.yaml
index 3118fe79..e90f4c1f 100644
--- a/broid-schemas/src/schemas/object/place.yaml
+++ b/broid-schemas/src/schemas/object/place.yaml
@@ -15,8 +15,8 @@ properties:
     type: number
   context:
     oneOf:
-      - $ref: "http://schemas.broid.ai/object/object.json"
-      - { type: array, items: { $ref: "http://schemas.broid.ai/object/object.json" } }
+      - $ref: "http://schemas.broid.ai/object/context.json"
+      - { type: array, items: { $ref: "http://schemas.broid.ai/object/context.json" } }
   tag:
     oneOf:
       - $ref: "http://schemas.broid.ai/embedded/tag.json"
diff --git a/broid-schemas/yarn.lock b/broid-schemas/yarn.lock
index 0268e237..dc19e315 100644
--- a/broid-schemas/yarn.lock
+++ b/broid-schemas/yarn.lock
@@ -30,6 +30,10 @@
   dependencies:
     "@types/node" "*"
 
+abbrev@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
 agent-base@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.0.1.tgz#bd8f9e86a8eb221fffa07bd14befd55df142815e"
@@ -84,7 +88,7 @@ balanced-match@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
-bluebird@^3.4.6:
+bluebird@^3.0.5, bluebird@^3.4.6:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
@@ -175,6 +179,10 @@ commander@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
 
+commander@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -192,6 +200,13 @@ concurrently@^3.1.0:
     supports-color "^3.2.3"
     tree-kill "^1.1.0"
 
+config-chain@~1.1.5:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 configstore@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.0.0.tgz#e1b8669c1803ccc50b545e92f8e6e79aa80e0196"
@@ -259,6 +274,16 @@ duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
+editorconfig@^0.13.2:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
+  dependencies:
+    bluebird "^3.0.5"
+    commander "^2.9.0"
+    lru-cache "^3.2.0"
+    semver "^5.1.0"
+    sigmund "^1.0.1"
+
 escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -394,7 +419,7 @@ inherits@2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
@@ -449,6 +474,15 @@ joi@^6.9.1:
     moment "2.x.x"
     topo "1.x.x"
 
+js-beautify@^1.6.14:
+  version "1.6.14"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
+  dependencies:
+    config-chain "~1.1.5"
+    editorconfig "^0.13.2"
+    mkdirp "~0.5.0"
+    nopt "~3.0.1"
+
 js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
@@ -492,6 +526,12 @@ lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
+lru-cache@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
+  dependencies:
+    pseudomap "^1.0.1"
+
 lru-cache@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -521,7 +561,7 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
-mkdirp@^0.5.0:
+mkdirp@^0.5.0, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -539,6 +579,12 @@ nodesecurity-npm-utils@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9"
 
+nopt@~3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 npm-run-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
@@ -607,6 +653,10 @@ prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+
 pseudomap@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -660,6 +710,10 @@ semver@~5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
 slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"