diff --git a/EdgeAndPropertyHierarchy/account/account.json b/EdgeAndPropertyHierarchy/account/account.json
new file mode 100644
index 0000000000000000000000000000000000000000..6521496a10acca1e4ea520774943c2266d3141b3
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/account/account.json
@@ -0,0 +1,4 @@
+{
+  "description": "An account or subscription, for instance for some online service, or a bank account or wallet.",
+  "type": "Account"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/date/dateOrdered/dateOrdered.json b/EdgeAndPropertyHierarchy/date/dateOrdered/dateOrdered.json
new file mode 100644
index 0000000000000000000000000000000000000000..2eec4cb0f89e0480d771424ef21fd7a9b0b668c9
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/date/dateOrdered/dateOrdered.json
@@ -0,0 +1,4 @@
+{
+  "description": "The date this Item was lost.",
+  "type": "datetime"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/discount/discount.json b/EdgeAndPropertyHierarchy/discount/discount.json
new file mode 100644
index 0000000000000000000000000000000000000000..880f4a5d6c0cbed200bfca97b72f0d632e6ea1c6
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/discount/discount.json
@@ -0,0 +1,4 @@
+{
+  "description": "A discount or price reduction.",
+  "type": "Measure"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/flag/flag.json b/EdgeAndPropertyHierarchy/flag/flag.json
index eab34ede61871df4d1e1bffec7ddbc2535ff7421..b5aa783f008a91fb44eb1be97ba7f9afec585952 100644
--- a/EdgeAndPropertyHierarchy/flag/flag.json
+++ b/EdgeAndPropertyHierarchy/flag/flag.json
@@ -1,4 +1,4 @@
 {
-  "description": "TBD",
-  "type": "File"
+  "description": "The flag that represents some Item, for instance a Country.",
+  "type": "Photo"
 }
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/handle/handle.json b/EdgeAndPropertyHierarchy/handle/handle.json
deleted file mode 100644
index 2045d1b924be371cb0105834d5564bc65cd73805..0000000000000000000000000000000000000000
--- a/EdgeAndPropertyHierarchy/handle/handle.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "description": "TBD",
-  "type": "string"
-}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/identifier/discountCode/discountCode.json b/EdgeAndPropertyHierarchy/identifier/discountCode/discountCode.json
new file mode 100644
index 0000000000000000000000000000000000000000..428a0f6cd16b7beb4900886f37be0695f129e735
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/identifier/discountCode/discountCode.json
@@ -0,0 +1,4 @@
+{
+  "description": "Can be used to get a discount.",
+  "type": "string"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/onlineProfile/onlineProfile.json b/EdgeAndPropertyHierarchy/onlineProfile/onlineProfile.json
deleted file mode 100644
index 3eecba25f9e3bbd98fefbb4b81494b67f70435bb..0000000000000000000000000000000000000000
--- a/EdgeAndPropertyHierarchy/onlineProfile/onlineProfile.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "description": "An online profile, typically on social media.",
-  "type": "OnlineProfile"
-}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/payedWithAccount/payedWithAccount.json b/EdgeAndPropertyHierarchy/payedWithAccount/payedWithAccount.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ddd25f324190c86dc79a7310ab2b70e2b640c3f
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/payedWithAccount/payedWithAccount.json
@@ -0,0 +1,4 @@
+{
+  "description": "The Account used to pay.",
+  "type": "Account"
+}
\ No newline at end of file
diff --git a/EdgeAndPropertyHierarchy/transaction/transaction.json b/EdgeAndPropertyHierarchy/transaction/transaction.json
new file mode 100644
index 0000000000000000000000000000000000000000..155c74ac4cf98650b21f61a9326b4d0de98c87a3
--- /dev/null
+++ b/EdgeAndPropertyHierarchy/transaction/transaction.json
@@ -0,0 +1,4 @@
+{
+  "description": "An agreement between a buyer and a seller to exchange an asset for payment.",
+  "type": "Transaction"
+}
\ No newline at end of file
diff --git a/TypeHierarchy/Item/Account/Account.json b/TypeHierarchy/Item/Account/Account.json
index c45b7cb42526f8a5dcb8ee400069f240017a16a9..7ffbbaf00471d44626584cc373a6d61d6e4c2a96 100644
--- a/TypeHierarchy/Item/Account/Account.json
+++ b/TypeHierarchy/Item/Account/Account.json
@@ -1,11 +1,12 @@
 {
-  "description": "An account or subscription, typically for some (online) service, for instance an Apple account.",
+  "description": "An account or subscription, for instance for some online service, or a bank account or wallet.",
   "properties": [
     "displayName",
     "nameQuality",
     "enablePresence",
     "enableReceipts",
-    "service"
+    "service",
+    "type"
   ],
   "relations": {
     "belongsTo": {
diff --git a/TypeHierarchy/Item/OnlineProfile/OnlineProfile.json b/TypeHierarchy/Item/OnlineProfile/OnlineProfile.json
deleted file mode 100644
index 9a827ebaa1108d0d146ee48d2e4745ba8ff035df..0000000000000000000000000000000000000000
--- a/TypeHierarchy/Item/OnlineProfile/OnlineProfile.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "description": "An online profile, typically on social media.",
-  "properties": [
-    "type",
-    "handle"
-  ],
-  "relations": {},
-  "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 c69751b48e39c907791d3053d7776298c02fde59..c53ee5a0296dfcb1c305275ab414af18d3ef2d96 100644
--- a/TypeHierarchy/Item/Person/Person.json
+++ b/TypeHierarchy/Item/Person/Person.json
@@ -51,7 +51,7 @@
       "sequenced": false,
       "singular": false
     },
-    "onlineProfile": {
+    "account": {
       "sequenced": false,
       "singular": false
     },
diff --git a/TypeHierarchy/Item/Receipt/Receipt.json b/TypeHierarchy/Item/Receipt/Receipt.json
index f278aa6408cbbd5a56e3e0228dfca880dd78ad77..dc304a74aa502a069084359d543987498c773e4d 100644
--- a/TypeHierarchy/Item/Receipt/Receipt.json
+++ b/TypeHierarchy/Item/Receipt/Receipt.json
@@ -3,9 +3,13 @@
   "properties": [
   ],
   "relations": {
-    "receipt": {
+    "file": {
       "sequenced": false,
-      "singular": false
+      "singular": true
+    },
+    "transaction": {
+      "sequenced": false,
+      "singular": true
     }
   },
   "foregroundColor": "#ffffff",
diff --git a/TypeHierarchy/Item/Transaction/Transaction.json b/TypeHierarchy/Item/Transaction/Transaction.json
index bc8de57f0f1c24258d6ed38d2b07d286948299ef..e59e266ff45f2c844ba728179013bf565c2c28b0 100644
--- a/TypeHierarchy/Item/Transaction/Transaction.json
+++ b/TypeHierarchy/Item/Transaction/Transaction.json
@@ -2,7 +2,10 @@
   "description": "An agreement between a buyer and a seller to exchange an asset for payment.",
   "properties": [
     "orderStatus",
-    "orderNumber"
+    "orderNumber",
+    "discountCode",
+    "dateOrdered",
+    "dateExecuted"
   ],
   "relations": {
     "purchaseLocation": {
@@ -16,6 +19,14 @@
     "billingAddress": {
       "sequenced": false,
       "singular": false
+    },
+    "payedWithAccount": {
+      "sequenced": false,
+      "singular": false
+    },
+    "discount": {
+      "sequenced": false,
+      "singular": false
     }
   },
   "foregroundColor": "#ffffff",