diff --git a/Projects/Governance/Icons/github-api.png b/Projects/Governance/Icons/github-api.png
new file mode 100644
index 000000000..c9f0dabdc
Binary files /dev/null and b/Projects/Governance/Icons/github-api.png differ
diff --git a/Projects/Governance/Icons/user-profile.png b/Projects/Governance/Icons/user-profile.png
new file mode 100644
index 000000000..fd89c6208
Binary files /dev/null and b/Projects/Governance/Icons/user-profile.png differ
diff --git a/Projects/Governance/Icons/zar.png b/Projects/Governance/Icons/zar.png
new file mode 100644
index 000000000..03452a56b
Binary files /dev/null and b/Projects/Governance/Icons/zar.png differ
diff --git a/Projects/Governance/Schemas/App-Schema/project-asset-class.json b/Projects/Governance/Schemas/App-Schema/asset-class.json
similarity index 100%
rename from Projects/Governance/Schemas/App-Schema/project-asset-class.json
rename to Projects/Governance/Schemas/App-Schema/asset-class.json
diff --git a/Projects/Governance/Schemas/App-Schema/civic-contributions.json b/Projects/Governance/Schemas/App-Schema/civic-contributions.json
index 08a52826c..e73c1cdda 100644
--- a/Projects/Governance/Schemas/App-Schema/civic-contributions.json
+++ b/Projects/Governance/Schemas/App-Schema/civic-contributions.json
@@ -32,6 +32,12 @@
             "label": "Add Feature Vote",
             "relatedUiObject": "Feature Vote"
         },
+        {
+            "action": "Add UI Object",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Time Vote",
+            "relatedUiObject": "Time Vote"
+        },
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
@@ -57,7 +63,7 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->User Contributions->Civic Contributions->"
+        "compatibleTypes": "->User Profile->Civic Contributions->"
     },
     "propertyNameAtParent": "civicContributions",
     "childrenNodesProperties": [
@@ -79,6 +85,12 @@
             "childType": "Feature Vote",
             "autoAdd": false
         },
+        {
+            "name": "timeVotes",
+            "type": "array",
+            "childType": "Time Vote",
+            "autoAdd": false
+        },
         {
             "name": "rankingVotes",
             "type": "array",
diff --git a/Projects/Governance/Schemas/App-Schema/community-contributions.json b/Projects/Governance/Schemas/App-Schema/community-contributions.json
index e41ce60b7..b34bfa6f0 100644
--- a/Projects/Governance/Schemas/App-Schema/community-contributions.json
+++ b/Projects/Governance/Schemas/App-Schema/community-contributions.json
@@ -39,7 +39,7 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->User Contributions->Community Contributions->"
+        "compatibleTypes": "->User Profile->Community Contributions->"
     },
     "propertyNameAtParent": "communityContributions",
     "childrenNodesProperties": [
diff --git a/Projects/Governance/Schemas/App-Schema/contributed-time.json b/Projects/Governance/Schemas/App-Schema/contributed-time.json
index 3ea1c677e..9895ec408 100644
--- a/Projects/Governance/Schemas/App-Schema/contributed-time.json
+++ b/Projects/Governance/Schemas/App-Schema/contributed-time.json
@@ -31,7 +31,7 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->Governance Contributions->"
+        "compatibleTypes": "->Time Contributions->"
     },
     "referencingRules": {
         "compatibleTypes": "->Ranking Position->"
diff --git a/Projects/Governance/Schemas/App-Schema/feature-class.json b/Projects/Governance/Schemas/App-Schema/feature-class.json
new file mode 100644
index 000000000..61f5ca07d
--- /dev/null
+++ b/Projects/Governance/Schemas/App-Schema/feature-class.json
@@ -0,0 +1,63 @@
+{
+    "type": "Feature Class",
+    "menuItems": [
+        {
+            "action": "Configure",
+            "actionFunction": "uiObject.configEditor.activate",
+            "label": "Configure",
+            "iconPathOn": "configuration",
+            "iconPathOff": "configuration"
+        },
+        {
+            "action": "Add UI Object",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Feature Class",
+            "relatedUiObject": "Feature Class"
+        },
+        {
+            "action": "Add UI Object",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Feature",
+            "relatedUiObject": "Feature"
+        },
+        {
+            "action": "Delete UI Object",
+            "askConfirmation": true,
+            "confirmationLabel": "Confirm to Delete",
+            "label": "Delete",
+            "iconPathOn": "delete-entity",
+            "iconPathOff": "delete-entity",
+            "actionFunction": "payload.executeAction"
+        }
+    ],
+    "editors": {
+        "config": true
+    },
+    "initialValues": {
+        "config": "{\n  \"description\": \"\", \"relativeWeight\": 0 \n}"
+    },
+    "addLeftIcons": true,
+    "level": 2,
+    "attachingRules": {
+        "compatibleTypes": "->Features->Feature Class->"
+    },
+    "referencingRules": {
+        "compatibleTypes": "->Team->Ranking Position->"
+    },
+    "propertyNameAtParent": "featureClasses",
+    "childrenNodesProperties": [
+        {
+            "name": "featureClasses",
+            "type": "array",
+            "childType": "Feature Class",
+            "autoAdd": false
+        },
+        {
+            "name": "features",
+            "type": "array",
+            "childType": "Feature",
+            "autoAdd": false
+        }
+    ],
+    "icon": "zar"
+}
\ No newline at end of file
diff --git a/Projects/Governance/Schemas/App-Schema/feature-vote.json b/Projects/Governance/Schemas/App-Schema/feature-vote.json
index 229e1a393..72fc22580 100644
--- a/Projects/Governance/Schemas/App-Schema/feature-vote.json
+++ b/Projects/Governance/Schemas/App-Schema/feature-vote.json
@@ -19,6 +19,7 @@
         }
     ],
     "title": [
+        "Use Reference Parent Parent Parent",
         "Use Reference Parent Parent",
         "Use Reference Parent"
     ],
@@ -34,8 +35,8 @@
         "compatibleTypes": "->Civic Contributions->"
     },
     "referencingRules": {
-        "compatibleTypes": "->Contributed Time->Governance Contributions->"
+        "compatibleTypes": "->Feature Class->Feature->"
     },
     "propertyNameAtParent": "featureVotes",
-    "icon": "ethereum"
+    "icon": "github-api"
 }
\ No newline at end of file
diff --git a/Projects/Governance/Schemas/App-Schema/project-feature.json b/Projects/Governance/Schemas/App-Schema/feature.json
similarity index 58%
rename from Projects/Governance/Schemas/App-Schema/project-feature.json
rename to Projects/Governance/Schemas/App-Schema/feature.json
index 366ac34be..ad2f8a448 100644
--- a/Projects/Governance/Schemas/App-Schema/project-feature.json
+++ b/Projects/Governance/Schemas/App-Schema/feature.json
@@ -1,5 +1,5 @@
 {
-    "type": "Project Feature",
+    "type": "Feature",
     "menuItems": [
         {
             "action": "Configure",
@@ -11,8 +11,14 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Project Feature",
-            "relatedUiObject": "Project Feature"
+            "label": "Add Feature Class",
+            "relatedUiObject": "Feature Class"
+        },
+        {
+            "action": "Add UI Object",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Feature",
+            "relatedUiObject": "Feature"
         },
         {
             "action": "Delete UI Object",
@@ -33,16 +39,25 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->Features->Project Feature->"
+        "compatibleTypes": "->Feature Class->Feature->"
     },
-    "propertyNameAtParent": "projectFeatures",
+    "referencingRules": {
+        "compatibleTypes": "->Team->Ranking Position->"
+    },
+    "propertyNameAtParent": "features",
     "childrenNodesProperties": [
         {
-            "name": "projectFeatures",
+            "name": "featureClasses",
             "type": "array",
-            "childType": "Project Feature",
+            "childType": "Feature Class",
+            "autoAdd": false
+        },
+        {
+            "name": "features",
+            "type": "array",
+            "childType": "Feature",
             "autoAdd": false
         }
     ],
-    "icon": "bitcoin"
+    "icon": "github-api"
 }
\ No newline at end of file
diff --git a/Projects/Governance/Schemas/App-Schema/features.json b/Projects/Governance/Schemas/App-Schema/features.json
index cb950f3c9..4c627c4db 100644
--- a/Projects/Governance/Schemas/App-Schema/features.json
+++ b/Projects/Governance/Schemas/App-Schema/features.json
@@ -4,8 +4,14 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Project Feature",
-            "relatedUiObject": "Project Feature"
+            "label": "Add Feature Class",
+            "relatedUiObject": "Feature Class"
+        },
+        {
+            "action": "Add UI Object",
+            "actionFunction": "payload.executeAction",
+            "label": "Add Feature",
+            "relatedUiObject": "Feature"
         },
         {
             "action": "Delete UI Object",
@@ -17,6 +23,7 @@
             "actionFunction": "payload.executeAction"
         }
     ],
+    "isHierarchyHead": true,
     "addLeftIcons": true,
     "level": 1,
     "attachingRules": {
@@ -24,9 +31,15 @@
     },
     "childrenNodesProperties": [
         {
-            "name": "projectFeatures",
+            "name": "featureClasses",
             "type": "array",
-            "childType": "Project Feature",
+            "childType": "Feature Class",
+            "autoAdd": false
+        },
+        {
+            "name": "features",
+            "type": "array",
+            "childType": "Feature",
             "autoAdd": false
         }
     ],
diff --git a/Projects/Governance/Schemas/App-Schema/governance-contributions.json b/Projects/Governance/Schemas/App-Schema/governance-contributions.json
index f2cd13a2f..6971afbe7 100644
--- a/Projects/Governance/Schemas/App-Schema/governance-contributions.json
+++ b/Projects/Governance/Schemas/App-Schema/governance-contributions.json
@@ -1,5 +1,5 @@
 {
-    "type": "Governance Contributions",
+    "type": "Time Contributions",
     "menuItems": [
         {
             "action": "Configure",
@@ -11,8 +11,8 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Governance Contributions",
-            "relatedUiObject": "Governance Contributions"
+            "label": "Add Time Contributions",
+            "relatedUiObject": "Time Contributions"
         },
         {
             "action": "Add UI Object",
@@ -39,14 +39,14 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->User Contributions->Governance Contributions->"
+        "compatibleTypes": "->User Profile->Time Contributions->"
     },
-    "propertyNameAtParent": "governanceContributions",
+    "propertyNameAtParent": "timeContributions",
     "childrenNodesProperties": [
         {
-            "name": "governanceContributions",
+            "name": "timeContributions",
             "type": "array",
-            "childType": "Governance Contributions",
+            "childType": "Time Contributions",
             "autoAdd": false
         },
         {
diff --git a/Projects/Governance/Schemas/App-Schema/governance-project.json b/Projects/Governance/Schemas/App-Schema/governance-project.json
index ce70075a6..eb838db37 100644
--- a/Projects/Governance/Schemas/App-Schema/governance-project.json
+++ b/Projects/Governance/Schemas/App-Schema/governance-project.json
@@ -21,8 +21,8 @@
         },
         {
             "action": "Add UI Object",
-            "label": "Add User Contributions",
-            "relatedUiObject": "User Contributions",
+            "label": "Add User Profile",
+            "relatedUiObject": "User Profile",
             "actionFunction": "payload.executeAction"
         },
         {
diff --git a/Projects/Governance/Schemas/App-Schema/marketing-contributions.json b/Projects/Governance/Schemas/App-Schema/marketing-contributions.json
index cfec4a2c0..af618182b 100644
--- a/Projects/Governance/Schemas/App-Schema/marketing-contributions.json
+++ b/Projects/Governance/Schemas/App-Schema/marketing-contributions.json
@@ -39,7 +39,7 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->User Contributions->Marketing Contributions->"
+        "compatibleTypes": "->User Profile->Marketing Contributions->"
     },
     "propertyNameAtParent": "marketingContributions",
     "childrenNodesProperties": [
diff --git a/Projects/Governance/Schemas/App-Schema/software-contributions.json b/Projects/Governance/Schemas/App-Schema/software-contributions.json
index 9d30f7935..4d849c93b 100644
--- a/Projects/Governance/Schemas/App-Schema/software-contributions.json
+++ b/Projects/Governance/Schemas/App-Schema/software-contributions.json
@@ -39,7 +39,7 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->User Contributions->Software Contributions->"
+        "compatibleTypes": "->User Profile->Software Contributions->"
     },
     "propertyNameAtParent": "softwareContributions",
     "childrenNodesProperties": [
diff --git a/Projects/Governance/Schemas/App-Schema/time-vote.json b/Projects/Governance/Schemas/App-Schema/time-vote.json
new file mode 100644
index 000000000..45984f061
--- /dev/null
+++ b/Projects/Governance/Schemas/App-Schema/time-vote.json
@@ -0,0 +1,41 @@
+{
+    "type": "Time Vote",
+    "menuItems": [
+        {
+            "action": "Configure",
+            "actionFunction": "uiObject.configEditor.activate",
+            "label": "Configure",
+            "iconPathOn": "configuration",
+            "iconPathOff": "configuration"
+        },
+        {
+            "action": "Delete UI Object",
+            "askConfirmation": true,
+            "confirmationLabel": "Confirm to Delete",
+            "label": "Delete",
+            "iconPathOn": "delete-entity",
+            "iconPathOff": "delete-entity",
+            "actionFunction": "payload.executeAction"
+        }
+    ],
+    "title": [
+        "Reference Parent Find Node Type->User Profile",
+        "Use Reference Parent"
+    ],
+    "editors": {
+        "config": true
+    },
+    "initialValues": {
+        "config": "{\n  \"description\": \"\"\n}"
+    },
+    "addLeftIcons": true,
+    "level": 2,
+    "attachingRules": {
+        "compatibleTypes": "->Civic Contributions->"
+    },
+    "referencingRules": {
+        "compatibleTypes": "->Contributed Time->"
+    },
+    "propertyNameAtParent": "timeVotes",
+    "icon": "dogecoin"
+}
\ No newline at end of file
diff --git a/Projects/Governance/Schemas/App-Schema/user-contributions.json b/Projects/Governance/Schemas/App-Schema/user-profile.json
similarity index 90%
rename from Projects/Governance/Schemas/App-Schema/user-contributions.json
rename to Projects/Governance/Schemas/App-Schema/user-profile.json
index df67e3757..91d3cac6c 100644
--- a/Projects/Governance/Schemas/App-Schema/user-contributions.json
+++ b/Projects/Governance/Schemas/App-Schema/user-profile.json
@@ -1,5 +1,5 @@
 {
-    "type": "User Contributions",
+    "type": "User Profile",
     "menuItems": [
         {
             "action": "Configure",
@@ -29,8 +29,8 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Governance Contributions",
-            "relatedUiObject": "Governance Contributions"
+            "label": "Add Time Contributions",
+            "relatedUiObject": "Time Contributions"
         },
         {
             "action": "Add UI Object",
@@ -78,9 +78,9 @@
             "autoAdd": false
         },
         {
-            "name": "governanceContributions",
+            "name": "timeContributions",
             "type": "array",
-            "childType": "Governance Contributions",
+            "childType": "Time Contributions",
             "autoAdd": false
         },
         {
@@ -89,6 +89,5 @@
             "childType": "Civic Contributions",
             "autoAdd": false
         }
-    ],
-    "icon": "bitcoin"
+    ]
 }
\ No newline at end of file
diff --git a/Projects/Governance/Schemas/App-Schema/user-vote.json b/Projects/Governance/Schemas/App-Schema/user-vote.json
index 9c86fb0e0..f74d785b8 100644
--- a/Projects/Governance/Schemas/App-Schema/user-vote.json
+++ b/Projects/Governance/Schemas/App-Schema/user-vote.json
@@ -19,7 +19,6 @@
         }
     ],
     "title": [
-        "Reference Parent Find Node Type->User Contributions",
         "Use Reference Parent"
     ],
     "editors": {
@@ -34,8 +33,8 @@
         "compatibleTypes": "->Civic Contributions->"
     },
     "referencingRules": {
-        "compatibleTypes": "->Contributed Time->Governance Contributions->"
+        "compatibleTypes": "->User Profile->"
     },
     "propertyNameAtParent": "userVotes",
-    "icon": "dogecoin"
+    "icon": "user-profile"
 }
\ No newline at end of file