diff --git a/EdgeAndPropertyHierarchy/backgroundPicture/backgroundPicture.json b/EdgeAndPropertyHierarchy/backgroundPicture/backgroundPicture.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a484b41c1d1f76b6baaa643d602d6919062656a
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/backgroundPicture/backgroundPicture.json
@@ -0,0 +1,4 @@
+{
+    "description": "Background picture used by an item.",
+    "type": "Photo"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/color/color.json b/EdgeAndPropertyHierarchy/color/color.json
index 03fb9221f95f0ace73f11cb91256939340744c26..fe3b621fae7ca1a25072a9a20b248efb163d6ae6 100644
--- a/EdgeAndPropertyHierarchy/color/color.json
+++ b/EdgeAndPropertyHierarchy/color/color.json
@@ -1,4 +1,7 @@
 {
-  "description": "The color of this Item.",
-  "type": "string"
+    "description": "The color of this Item.",
+    "type": "string",
+    "properties": [
+        "name"
+    ]
 }
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/follows/follows.json b/EdgeAndPropertyHierarchy/follows/follows.json
new file mode 100644
index 0000000000000000000000000000000000000000..c6ffae88397db6f6a154181ac72af253bb88d34e
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/follows/follows.json
@@ -0,0 +1,4 @@
+{
+    "description": "Item that follows another item.",
+    "type": "Account"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/language/language.json b/EdgeAndPropertyHierarchy/language/language.json
new file mode 100644
index 0000000000000000000000000000000000000000..e17448fb501eb7c544f137914e95fb8f9d95fd24
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/language/language.json
@@ -0,0 +1,4 @@
+{
+    "description": "A natural language this item uses.",
+    "type": "string"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/owner/owner.json b/EdgeAndPropertyHierarchy/owner/owner.json
new file mode 100644
index 0000000000000000000000000000000000000000..f3d76c2696716f2e64efe1c6c2e20f97172bf6c1
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/owner/owner.json
@@ -0,0 +1,4 @@
+{
+    "description": "Owner of an item.",
+    "type": "any"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/profileBackgroundColor/profileBackgroundColor.json b/EdgeAndPropertyHierarchy/profileBackgroundColor/profileBackgroundColor.json
new file mode 100644
index 0000000000000000000000000000000000000000..6c65368f151fd90ac1eae906ad197a633aed14ab
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/profileBackgroundColor/profileBackgroundColor.json
@@ -0,0 +1,4 @@
+{
+    "description": "Background color used by an account.",
+    "type": "Color"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/profileLinkColor/profileLinkColor.json b/EdgeAndPropertyHierarchy/profileLinkColor/profileLinkColor.json
new file mode 100644
index 0000000000000000000000000000000000000000..d800d6a5467df9994c8fd8341c6785522256fc10
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/profileLinkColor/profileLinkColor.json
@@ -0,0 +1,4 @@
+{
+    "description": "Link color set by account.",
+    "type": "Color"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/profileSidebarBorderColor/profileSidebarBorderColor.json b/EdgeAndPropertyHierarchy/profileSidebarBorderColor/profileSidebarBorderColor.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1ceeddb20e47a21e5a19cb696bfa219e8088c37
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/profileSidebarBorderColor/profileSidebarBorderColor.json
@@ -0,0 +1,4 @@
+{
+    "description": "Side bar border color set by account.",
+    "type": "Color"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/profileSidebarFillColor/profileSidebarFillColor.json b/EdgeAndPropertyHierarchy/profileSidebarFillColor/profileSidebarFillColor.json
new file mode 100644
index 0000000000000000000000000000000000000000..86e19ec38ce90a6d3b4e6f0d5d17a3935af1f101
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/profileSidebarFillColor/profileSidebarFillColor.json
@@ -0,0 +1,4 @@
+{
+    "description": "Side bar fill color set by account.",
+    "type": "Color"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/quotes/quotes.json b/EdgeAndPropertyHierarchy/quotes/quotes.json
new file mode 100644
index 0000000000000000000000000000000000000000..4e811ca50b557f916253fa817f62b48583f28a6d
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/quotes/quotes.json
@@ -0,0 +1,4 @@
+{
+    "description": "A quoted item.",
+    "type": "any"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/sender/sender.json b/EdgeAndPropertyHierarchy/sender/sender.json
index 54d1c29b9015f9e2613d3b0bd85ffe151933aee2..e337b905049518cdf2f6447c97b1efff90cc8263 100644
--- a/EdgeAndPropertyHierarchy/sender/sender.json
+++ b/EdgeAndPropertyHierarchy/sender/sender.json
@@ -1,4 +1,4 @@
 {
-  "description": "The sender of an Item.",
-  "type": "Account"
+    "description": "The sender of an Item.",
+    "type": "Account"
 }
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/sets/sets.json b/EdgeAndPropertyHierarchy/sets/sets.json
new file mode 100644
index 0000000000000000000000000000000000000000..5d019e8c1e2ad29afe93cfadc93bdf5451207a70
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/sets/sets.json
@@ -0,0 +1,4 @@
+{
+    "description": "An Item sets another item as contact or background photo.",
+    "type": "any"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/source/source.json b/EdgeAndPropertyHierarchy/source/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..659e48100aab5d88a31dfe8cfd55eb3cf3b858c7
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/source/source.json
@@ -0,0 +1,4 @@
+{
+    "description": "The source where this item can be traced.",
+    "type": "string"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/tags/tags.json b/EdgeAndPropertyHierarchy/tags/tags.json
new file mode 100644
index 0000000000000000000000000000000000000000..df84d84b37c072a7d6b80853876fc5fc99fc8074
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/tags/tags.json
@@ -0,0 +1,4 @@
+{
+    "description": "A tag mentioned in a post or message.",
+    "type": "Hashtag"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/uploads/uploads.json b/EdgeAndPropertyHierarchy/uploads/uploads.json
new file mode 100644
index 0000000000000000000000000000000000000000..89626c1d6726b6187ab01c7b9a1661d8b1137318
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/uploads/uploads.json
@@ -0,0 +1,4 @@
+{
+    "description": "An Item this item uploads such as a photo or video.",
+    "type": "any"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/withheldIn/withheldIn.json b/EdgeAndPropertyHierarchy/withheldIn/withheldIn.json
new file mode 100644
index 0000000000000000000000000000000000000000..fd536efd792b012ad3e58d224d4ce9b0ea714891
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/withheldIn/withheldIn.json
@@ -0,0 +1,4 @@
+{
+    "description": "Country where an account is withheld.",
+    "type": "Country"
+}
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Account/Account.json b/TypeHierarchy/Item/Account/Account.json
index 0ba4c7985d81931f5b98e32744b1be70b3f124e2..b1cd73c865860761a69e9307147f1323df9acbed 100644
--- a/TypeHierarchy/Item/Account/Account.json
+++ b/TypeHierarchy/Item/Account/Account.json
@@ -1,30 +1,77 @@
 {
-  "description": "An account or subscription, for instance for some online service, or a bank account or wallet.",
-  "properties": [
-    "handle",
-    "displayName",
-    "service",
-    "itemType",
-    "avatarUrl"
-  ],
-  "relations": {
-    "belongsTo": {
-      "sequenced": false,
-      "singular": false
+    "description": "An account or subscription, for instance for some online service, or a bank account or wallet.",
+    "properties": [
+        "handle",
+        "displayName",
+        "service",
+        "itemType",
+        "description",
+        "verified",
+        "contributorsEnabled",
+        "notifications"
+    ],
+    "relations": {
+        "belongsTo": {
+            "sequenced": false,
+            "singular": false
+        },
+        "price": {
+            "sequenced": false,
+            "singular": false
+        },
+        "location": {
+            "sequenced": false,
+            "singular": false
+        },
+        "organization": {
+            "sequenced": false,
+            "singular": false
+        },
+        "follows": {
+            "sequenced": false,
+            "singular": false
+        },
+        "withheldIn": {
+            "sequenced": false,
+            "singular": false
+        },
+        "profilePicture": {
+            "sequenced": false,
+            "singular": false
+        },
+        "backgroundPicture": {
+            "sequenced": false,
+            "singular": false
+        },
+        "profileBackgroundColor": {
+            "sequenced": false,
+            "singular": false
+        },
+        "profileLinkColor": {
+            "sequenced": false,
+            "singular": false
+        },
+        "profileSidebarBorderColor": {
+            "sequenced": false,
+            "singular": false
+        },
+        "profileSidebarFillColor": {
+            "sequenced": false,
+            "singular": false
+        },
+        "language": {
+            "sequenced": false,
+            "singular": false
+        },
+        "url": {
+            "sequenced": false,
+            "singular": false
+        },
+        "sender": {
+            "sequenced": false,
+            "singular": false
+        }
     },
-    "price": {
-      "sequenced": false,
-      "singular": false
-    },
-    "location": {
-      "sequenced": false,
-      "singular": false
-    },
-    "organization": {
-      "sequenced": false,
-      "singular": false
-    }
-  },
-  "foregroundColor": "#ffffff",
-  "backgroundColor": "#93c47d"
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
 }
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Hashtag/Hashtag.json b/TypeHierarchy/Item/Hashtag/Hashtag.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d3d8c59620c913b0ac99ff7fc311641c4d6f531
--- /dev/null
+++ b/TypeHierarchy/Item/Hashtag/Hashtag.json
@@ -0,0 +1,9 @@
+{
+    "description": "A hashtag e.g on a post",
+    "properties": [
+        "name"
+    ],
+    "relations": {},
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
+}
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Language/Language.json b/TypeHierarchy/Item/Language/Language.json
new file mode 100644
index 0000000000000000000000000000000000000000..6abb761ce5b3f75fcf9e96a809b42af2328da461
--- /dev/null
+++ b/TypeHierarchy/Item/Language/Language.json
@@ -0,0 +1,9 @@
+{
+    "description": "A language",
+    "properties": [
+        "name"
+    ],
+    "relations": {},
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
+}
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Location/Country/Country.json b/TypeHierarchy/Item/Location/Country/Country.json
index 75f3ea9d8550555cd6a6f734b90fc366dd89d12a..c7a792157ac2a132039d2debb2bfbdd67b722d20 100644
--- a/TypeHierarchy/Item/Location/Country/Country.json
+++ b/TypeHierarchy/Item/Location/Country/Country.json
@@ -1,18 +1,18 @@
 {
-  "description": "A country.",
-  "properties": [
-    "name"
-  ],
-  "relations": {
-    "flag": {
-      "sequenced": false,
-      "singular": true
+    "description": "A country.",
+    "properties": [
+        "name"
+    ],
+    "relations": {
+        "flag": {
+            "sequenced": false,
+            "singular": true
+        },
+        "location": {
+            "sequenced": false,
+            "singular": true
+        }
     },
-    "location": {
-      "sequenced": false,
-      "singular": true
-    }
-  },
-  "foregroundColor": "#ffffff",
-  "backgroundColor": "#93c47d"
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
 }
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Message/Message.json b/TypeHierarchy/Item/Message/Message.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1fb443244b7db8c0326ed54a988fce4559dc828
--- /dev/null
+++ b/TypeHierarchy/Item/Message/Message.json
@@ -0,0 +1,46 @@
+{
+    "description": "A message is a tweet or post.",
+    "properties": [
+        "name",
+        "topic",
+        "encrypted",
+        "dateCreated",
+        "fullText",
+        "retweetCount",
+        "favoriteCount",
+        "favorited",
+        "retweeted"
+    ],
+    "relations": {
+        "uploads": {
+            "sequenced": false,
+            "singular": false
+        },
+        "language": {
+            "sequenced": false,
+            "singular": false
+        },
+        "source": {
+            "sequenced": false,
+            "singular": false
+        },
+        "url": {
+            "sequenced": false,
+            "singular": false
+        },
+        "includes": {
+            "sequenced": false,
+            "singular": false
+        },
+        "tags": {
+            "sequenced": false,
+            "singular": false
+        },
+        "quotes": {
+            "sequenced": false,
+            "singular": false
+        }
+    },
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
+}
\ No newline at end of file
diff --git a/TypeHierarchy/Item/MessageChannel/MessageChannel.json b/TypeHierarchy/Item/MessageChannel/MessageChannel.json
index 1e4e358fcb744ceaf0031292e2ab7e6b8ce2f42b..0910b920b454e7d19f5ce90b4a33726d86f4a794 100644
--- a/TypeHierarchy/Item/MessageChannel/MessageChannel.json
+++ b/TypeHierarchy/Item/MessageChannel/MessageChannel.json
@@ -1,20 +1,20 @@
 {
-  "description": "A chat is a collection of messages.",
-  "properties": [
-    "name",
-    "topic",
-    "encrypted"
-  ],
-  "relations": {
-    "photo": {
-      "sequenced": false,
-      "singular": false
+    "description": "A chat is a collection of messages.",
+    "properties": [
+        "name",
+        "topic",
+        "encrypted"
+    ],
+    "relations": {
+        "photo": {
+            "sequenced": false,
+            "singular": false
+        },
+        "receiver": {
+            "sequenced": false,
+            "singular": false
+        }
     },
-    "receiver": {
-      "sequenced": false,
-      "singular": false
-    }
-  },
-  "foregroundColor": "#ffffff",
-  "backgroundColor": "#93c47d"
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
 }
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Person/Person.json b/TypeHierarchy/Item/Person/Person.json
index 057cc84198210f64f0bb280ebb18fee0aeb5993c..55284bf49b39d21b3f0c8d4f459350c1e47cd756 100644
--- a/TypeHierarchy/Item/Person/Person.json
+++ b/TypeHierarchy/Item/Person/Person.json
@@ -115,8 +115,12 @@
     "relation": {
       "sequenced": false,
       "singular": false
+    },
+    "owner": {
+      "sequenced": false,
+      "singular": false
     }
   },
   "foregroundColor": "#ffffff",
   "backgroundColor": "#3a5eb2"
-}
\ No newline at end of file
+}
diff --git a/TypeHierarchy/Item/Symbol/Symbol.json b/TypeHierarchy/Item/Symbol/Symbol.json
new file mode 100644
index 0000000000000000000000000000000000000000..a358fd8c1417ed80e734ba52edb7ba4871e1081e
--- /dev/null
+++ b/TypeHierarchy/Item/Symbol/Symbol.json
@@ -0,0 +1,9 @@
+{
+    "description": "A symbol such as an emoji",
+    "properties": [
+        "name"
+    ],
+    "relations": {},
+    "foregroundColor": "#ffffff",
+    "backgroundColor": "#93c47d"
+}
\ No newline at end of file