diff --git a/framework/data/MoquiSetupData.xml b/framework/data/MoquiSetupData.xml
index 3aba25af1..7be275f14 100644
--- a/framework/data/MoquiSetupData.xml
+++ b/framework/data/MoquiSetupData.xml
@@ -120,6 +120,9 @@ along with this software (see the LICENSE.md file). If not, see
     <moqui.security.UserPermission userPermissionId="KibanaRemote" description="Kibana Remote Access"/>
     <moqui.security.UserGroupPermission userGroupId="ADMIN" userPermissionId="KibanaRemote" fromDate="0"/>
 
+    <moqui.security.UserPermission userPermissionId="GrafanaRemote" description="Grafana Remote Access"/>
+    <moqui.security.UserGroupPermission userGroupId="ADMIN" userPermissionId="GrafanaRemote" fromDate="0"/>
+
     <!-- Handy cron strings: [0 0 2 * * ?] every night at 2:00 am, [0 0/15 * * * ?] every 15 minutes, [0 0/2 * * * ?] every 2 minutes -->
     <moqui.service.job.ServiceJob jobName="clean_ElasticSearchLogMessages_daily" description="Clean log messages stored in ElasticSearch"
             serviceName="org.moqui.search.SearchServices.delete#Documents" cronExpression="0 0 2 * * ?" paused="Y">
diff --git a/framework/entity/OlapEntities.xml b/framework/entity/OlapEntities.xml
index 033080b72..5096ad8b4 100644
--- a/framework/entity/OlapEntities.xml
+++ b/framework/entity/OlapEntities.xml
@@ -30,6 +30,25 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="yearAndMonth" type="text-medium"><description>Format: YYYY-MM</description></field>
         <field name="isWeekEnd" type="text-indicator"/>
     </entity>
+    <entity entity-name="TimeDayDimension" package="moqui.olap" use="analytical">
+        <description>Time of Day Dimension. The natural key is [timeValue]</description>
+        <field name="dimensionId" type="id" is-pk="true"/>
+        <field name="timeValue" type="time"/>
+        <field name="description" type="text-medium"/>
+        <field name="timeOfDay" type="text-medium"><description>Time of the day in the format: hh:mm:ss</description></field>
+        <field name="hourOfDay" type="number-integer"><description>Hour of the day (0 - 11). Hour on a 12-hour clock.</description></field>
+        <field name="militaryHour" type="number-integer"><description>Military hour of the day (0 - 23). Hour on a 24-hour clock.</description></field>
+        <field name="quarterHour" type="text-medium"><description>Extraction of the quarter hours.</description></field>
+        <field name="minuteOfHour" type="number-integer"><description>Minute of the hour (0 - 59).</description></field>
+        <field name="secondOfMinute" type="number-integer"><description>Second of the minute (0 - 59).</description></field>
+        <field name="minuteOfDay" type="number-integer"><description>Minute of the day (0 - 1439).</description></field>
+        <field name="secondOfDay" type="number-integer"><description>Second of the day (0 - 86399).</description></field>
+        <field name="amPm" type="text-medium"><description>AM/PM indicator.</description></field>
+        <field name="dayNight" type="text-medium"><description>Indicator of day or night.</description></field>
+        <field name="dayNightAbbrev" type="text-medium"><description>Abbreviated indicator of day or night.</description></field>
+        <field name="timePeriod" type="text-medium"><description>Names of day periods.</description></field>
+        <field name="timePeriodAbbrev" type="text-medium"><description>Abbreviated names of day periods.</description></field>
+    </entity>
     <entity entity-name="CurrencyDimension" package="moqui.olap" use="analytical">
         <description>Currency Dimension. The natural key is [currencyId]</description>
         <field name="dimensionId" type="id" is-pk="true"/>
diff --git a/framework/entity/ScreenEntities.xml b/framework/entity/ScreenEntities.xml
index cc296a3e1..abf476f14 100644
--- a/framework/entity/ScreenEntities.xml
+++ b/framework/entity/ScreenEntities.xml
@@ -523,4 +523,27 @@ along with this software (see the LICENSE.md file). If not, see
         </field>
     </entity>
     -->
+
+    <!-- ========================================================= -->
+    <!-- moqui.screen.dashboard -->
+    <!-- ========================================================= -->
+
+    <entity entity-name="Dashboard" package="moqui.screen.dashboard" short-alias="dashboards" use="configuration" cache="true">
+        <description>Metadata for dashboards and external reports to be included in Moqui screens.</description>
+        <field name="dashboardId" type="id" is-pk="true"/>
+        <field name="dashboardTypeEnumId" type="id" not-null="true"/>
+        <field name="dashboardLocation" type="text-medium" not-null="true"/>
+        <field name="dashboardName" type="text-medium" not-null="true"/>
+        <field name="description" type="text-long"/>
+
+        <relationship type="one" title="DashboardType" related="moqui.basic.Enumeration" short-alias="type">
+            <key-map field-name="dashboardTypeEnumId"/></relationship>
+        <seed-data>
+            <!-- Dashboard Type -->
+            <moqui.basic.EnumerationType description="Dashboard Type" enumTypeId="DashboardType"/>
+            <moqui.basic.Enumeration description="Screen Widgets Dashboard" enumId="DashScreenWidgets" enumTypeId="DashboardType"/>
+            <moqui.basic.Enumeration description="Kibana Dashboard" enumId="DashKibana" enumTypeId="DashboardType"/>
+            <moqui.basic.Enumeration description="Grafana Dashboard" enumId="DashGrafana" enumTypeId="DashboardType"/>
+        </seed-data>
+    </entity>
 </entities>
diff --git a/framework/service/org/moqui/impl/EntityServices.xml b/framework/service/org/moqui/impl/EntityServices.xml
index 8e6bb3341..de8513a52 100644
--- a/framework/service/org/moqui/impl/EntityServices.xml
+++ b/framework/service/org/moqui/impl/EntityServices.xml
@@ -415,4 +415,5 @@ along with this software (see the LICENSE.md file). If not, see
             }
         ]]></script></actions>
     </service>
+
 </services>