diff --git a/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Index.tsx b/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Index.tsx
index 21b1f6b9816..96646a1b88c 100644
--- a/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Index.tsx
+++ b/Dashboard/src/Pages/OnCallDuty/OnCallDutyPolicy/Index.tsx
@@ -19,7 +19,7 @@ const OnCallDutyPolicyView: FunctionComponent<PageComponentProps> = (
     return (
         <Fragment>
             {/* OnCallDutyPolicy View  */}
-            <CardModelDetail
+            <CardModelDetail<OnCallDutyPolicy>
                 name="On-Call Policy > On-Call Policy Details"
                 cardProps={{
                     title: 'On-Call Policy Details',
@@ -105,7 +105,7 @@ const OnCallDutyPolicyView: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'Labels',
                             fieldType: FieldType.Element,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: OnCallDutyPolicy): ReactElement => {
                                 return (
                                     <LabelsElement
                                         labels={
diff --git a/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Index.tsx b/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Index.tsx
index ca41725287b..0ae8f917c85 100644
--- a/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Index.tsx
+++ b/Dashboard/src/Pages/OnCallDuty/OnCallDutySchedule/Index.tsx
@@ -19,7 +19,7 @@ const OnCallDutyScheduleView: FunctionComponent<PageComponentProps> = (
     return (
         <Fragment>
             {/* OnCallDutySchedule View  */}
-            <CardModelDetail
+            <CardModelDetail<OnCallDutySchedule>
                 name="On-Call Schedule > On-Call Schedule Details"
                 cardProps={{
                     title: 'On-Call Schedule Details',
@@ -105,7 +105,7 @@ const OnCallDutyScheduleView: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'Labels',
                             fieldType: FieldType.Element,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: OnCallDutySchedule): ReactElement => {
                                 return (
                                     <LabelsElement
                                         labels={
diff --git a/Dashboard/src/Pages/ScheduledMaintenanceEvents/View/InternalNote.tsx b/Dashboard/src/Pages/ScheduledMaintenanceEvents/View/InternalNote.tsx
index 116cca4d10c..d6af9f251a8 100644
--- a/Dashboard/src/Pages/ScheduledMaintenanceEvents/View/InternalNote.tsx
+++ b/Dashboard/src/Pages/ScheduledMaintenanceEvents/View/InternalNote.tsx
@@ -227,14 +227,11 @@ const ScheduledMaintenanceDelete: FunctionComponent<PageComponentProps> = (
 
                         type: FieldType.Entity,
 
-                        getElement: (item: JSONObject): ReactElement => {
+                        getElement: (item: ScheduledMaintenanceInternalNote): ReactElement => {
                             return (
                                 <UserElement
                                     user={
-                                        BaseModel.fromJSON(
-                                            item['createdByUser'] as JSONObject,
-                                            User
-                                        ) as User
+                                        item['createdByUser']
                                     }
                                     suffix={'wrote'}
                                     usernameClassName={
diff --git a/Dashboard/src/Pages/Settings/IncidentTemplatesView.tsx b/Dashboard/src/Pages/Settings/IncidentTemplatesView.tsx
index 79a0483be34..a6d41fa968c 100644
--- a/Dashboard/src/Pages/Settings/IncidentTemplatesView.tsx
+++ b/Dashboard/src/Pages/Settings/IncidentTemplatesView.tsx
@@ -32,6 +32,7 @@ import ProjectUser from '../../Utils/ProjectUser';
 import UserElement from '../../Components/User/User';
 import User from 'Model/Models/User';
 import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
+import { Black } from 'Common/Types/BrandColors';
 
 const TeamView: FunctionComponent<PageComponentProps> = (
     _props: PageComponentProps
@@ -41,7 +42,7 @@ const TeamView: FunctionComponent<PageComponentProps> = (
     return (
         <Fragment>
             {/* Incident View  */}
-            <CardModelDetail
+            <CardModelDetail<IncidentTemplate>
                 name="Incident Template Details"
                 cardProps={{
                     title: 'Incident Template Details',
@@ -249,7 +250,7 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'Incident Severity',
                             fieldType: FieldType.Entity,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: IncidentTemplate): ReactElement => {
                                 if (!item['incidentSeverity']) {
                                     return <p>No incident severity.</p>;
                                 }
@@ -257,18 +258,10 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                                 return (
                                     <Pill
                                         color={
-                                            (
-                                                item[
-                                                    'incidentSeverity'
-                                                ] as JSONObject
-                                            )['color'] as Color
+                                           item.incidentSeverity.color || Black
                                         }
                                         text={
-                                            (
-                                                item[
-                                                    'incidentSeverity'
-                                                ] as JSONObject
-                                            )['name'] as string
+                                            item.incidentSeverity.name || 'Unknown'
                                         }
                                     />
                                 );
@@ -283,16 +276,13 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'Monitors Affected',
                             fieldType: FieldType.Element,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: IncidentTemplate): ReactElement => {
                                 return (
                                     <MonitorsElement
                                         monitors={
-                                            BaseModel.fromJSON(
-                                                (item[
-                                                    'monitors'
-                                                ] as JSONArray) || [],
-                                                Monitor
-                                            ) as Array<Monitor>
+                                            item[
+                                                'monitors'
+                                            ] || []
                                         }
                                     />
                                 );
@@ -307,16 +297,13 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'On-Call Duty Policies',
                             fieldType: FieldType.Element,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: IncidentTemplate): ReactElement => {
                                 return (
                                     <OnCallDutyPoliciesView
                                         onCallPolicies={
-                                            BaseModel.fromJSON(
-                                                (item[
-                                                    'onCallDutyPolicies'
-                                                ] as JSONArray) || [],
-                                                OnCallDutyPolicy
-                                            ) as Array<OnCallDutyPolicy>
+                                            item[
+                                                'onCallDutyPolicies'
+                                            ] || []
                                         }
                                     />
                                 );
@@ -338,7 +325,7 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'Labels',
                             fieldType: FieldType.Element,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: IncidentTemplate): ReactElement => {
                                 return (
                                     <LabelsElement
                                         labels={
@@ -421,7 +408,7 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                         title: 'Team',
                         type: FieldType.Entity,
 
-                        getElement: (item: JSONObject): ReactElement => {
+                        getElement: (item: IncidentTemplateOwnerTeam): ReactElement => {
                             if (!item['team']) {
                                 throw new BadDataException('Team not found');
                             }
@@ -509,7 +496,7 @@ const TeamView: FunctionComponent<PageComponentProps> = (
                         },
                         title: 'User',
                         type: FieldType.Entity,
-                        getElement: (item: JSONObject): ReactElement => {
+                        getElement: (item: IncidentTemplateOwnerUser): ReactElement => {
                             if (!item['user']) {
                                 throw new BadDataException('User not found');
                             }
diff --git a/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx b/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx
index 32c959061fb..0dbb5e4a79f 100644
--- a/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx
+++ b/Dashboard/src/Pages/StatusPages/View/EmailSubscribers.tsx
@@ -258,7 +258,7 @@ const StatusPageDelete: FunctionComponent<PageComponentProps> = (
                                 title: 'Status',
                                 type: FieldType.Text,
                                 getElement: (
-                                    item: JSONObject
+                                    item: StatusPageSubscriber
                                 ): ReactElement => {
                                     if (item['isUnsubscribed']) {
                                         return (
diff --git a/Dashboard/src/Pages/StatusPages/View/OverviewPageBranding.tsx b/Dashboard/src/Pages/StatusPages/View/OverviewPageBranding.tsx
index 5de0062d411..f1e694ed6a6 100644
--- a/Dashboard/src/Pages/StatusPages/View/OverviewPageBranding.tsx
+++ b/Dashboard/src/Pages/StatusPages/View/OverviewPageBranding.tsx
@@ -188,7 +188,7 @@ const StatusPageDelete: FunctionComponent<PageComponentProps> = (
                             description:
                                 'These monitor statuses are be considered as down when we calculate uptime %',
                             fieldType: FieldType.EntityArray,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: StatusPage): ReactElement => {
                                 if (item['downtimeMonitorStatuses']) {
                                     return (
                                         <MonitorStatuesElement
diff --git a/Dashboard/src/Pages/Telemetry/Services/View/Index.tsx b/Dashboard/src/Pages/Telemetry/Services/View/Index.tsx
index 76c3160dc14..02b9f0d0975 100644
--- a/Dashboard/src/Pages/Telemetry/Services/View/Index.tsx
+++ b/Dashboard/src/Pages/Telemetry/Services/View/Index.tsx
@@ -19,7 +19,7 @@ const ServiceDelete: FunctionComponent<PageComponentProps> = (
     return (
         <Fragment>
             {/* Service View  */}
-            <CardModelDetail
+            <CardModelDetail<TelemetryService>
                 name="Service Details"
                 formSteps={[
                     {
@@ -104,7 +104,7 @@ const ServiceDelete: FunctionComponent<PageComponentProps> = (
                             },
                             title: 'Labels',
                             fieldType: FieldType.Element,
-                            getElement: (item: JSONObject): ReactElement => {
+                            getElement: (item: TelemetryService): ReactElement => {
                                 return (
                                     <LabelsElement
                                         labels={