diff --git a/src/components/admin/unit/inspection/OkNotOk.vue b/src/components/admin/unit/inspection/OkNotOk.vue
index 8140e7f..460c3df 100644
--- a/src/components/admin/unit/inspection/OkNotOk.vue
+++ b/src/components/admin/unit/inspection/OkNotOk.vue
@@ -24,8 +24,8 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import { RadioGroup, RadioGroupLabel, RadioGroupOption } from "@headlessui/vue";
-import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+import { RadioGroup, RadioGroupOption } from "@headlessui/vue";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspection/ResultInput.vue b/src/components/admin/unit/inspection/ResultInput.vue
index 7a8d110..2e68a1b 100644
--- a/src/components/admin/unit/inspection/ResultInput.vue
+++ b/src/components/admin/unit/inspection/ResultInput.vue
@@ -22,7 +22,7 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryGear/CreateRespiratoryGearModal.vue b/src/components/admin/unit/respiratoryGear/CreateRespiratoryGearModal.vue
index 7ffdc50..c5ece71 100644
--- a/src/components/admin/unit/respiratoryGear/CreateRespiratoryGearModal.vue
+++ b/src/components/admin/unit/respiratoryGear/CreateRespiratoryGearModal.vue
@@ -137,6 +137,7 @@ export default defineComponent({
         name: "",
         location: "",
         equipmentTypeId: "",
+        commissioned: new Date(),
       };
       this.status = "loading";
       this.createEquipment(createEquipment)
diff --git a/src/components/admin/unit/respiratoryMission/CreateRespiratoryMissionModal.vue b/src/components/admin/unit/respiratoryMission/CreateRespiratoryMissionModal.vue
index 7ffdc50..c5ece71 100644
--- a/src/components/admin/unit/respiratoryMission/CreateRespiratoryMissionModal.vue
+++ b/src/components/admin/unit/respiratoryMission/CreateRespiratoryMissionModal.vue
@@ -137,6 +137,7 @@ export default defineComponent({
         name: "",
         location: "",
         equipmentTypeId: "",
+        commissioned: new Date(),
       };
       this.status = "loading";
       this.createEquipment(createEquipment)
diff --git a/src/components/admin/unit/respiratoryWearer/CreateRespiratoryWearerModal.vue b/src/components/admin/unit/respiratoryWearer/CreateRespiratoryWearerModal.vue
index 7ffdc50..c5ece71 100644
--- a/src/components/admin/unit/respiratoryWearer/CreateRespiratoryWearerModal.vue
+++ b/src/components/admin/unit/respiratoryWearer/CreateRespiratoryWearerModal.vue
@@ -137,6 +137,7 @@ export default defineComponent({
         name: "",
         location: "",
         equipmentTypeId: "",
+        commissioned: new Date(),
       };
       this.status = "loading";
       this.createEquipment(createEquipment)
diff --git a/src/demodata/damageReport.ts b/src/demodata/damageReport.ts
index 61f85d0..d65e381 100644
--- a/src/demodata/damageReport.ts
+++ b/src/demodata/damageReport.ts
@@ -8,13 +8,14 @@ export const damageReportDemoData: Array<DamageReportViewModel> = [
     status: "in Arbeit",
     done: false,
     description: "knjgljna g",
-    providedImage: undefined,
+    providedImage: [],
     relatedId: "abc",
     related: {
       id: "abc",
       code: "0456984224498",
       name: "B-Schlauch",
       location: "HLF",
+      commissioned: new Date(),
       equipmentTypeId: "xyz",
       equipmentType: {
         id: "xyz",
@@ -24,5 +25,6 @@ export const damageReportDemoData: Array<DamageReportViewModel> = [
       },
       inspections: [],
     },
+    assigned: "equipment",
   },
 ];
diff --git a/src/demodata/inspectionPlan.ts b/src/demodata/inspectionPlan.ts
index 275e692..9482312 100644
--- a/src/demodata/inspectionPlan.ts
+++ b/src/demodata/inspectionPlan.ts
@@ -1,6 +1,8 @@
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
 import type {
+  InspectionPlanViewModel,
   InspectionPointViewModel,
+} from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type {
   InspectionPointResultViewModel,
   InspectionViewModel,
 } from "@/viewmodels/admin/unit/inspection/inspection.models";
@@ -48,6 +50,7 @@ export const inspectionPlanDemoData: Array<InspectionPlanViewModel> = [
       description: "Shläuche vom Typ B",
       inspectionPlans: [],
     },
+    assigned: "equipment",
   },
   {
     id: "cba",
@@ -64,6 +67,7 @@ export const inspectionPlanDemoData: Array<InspectionPlanViewModel> = [
       description: "Shläuche vom Typ B",
       inspectionPlans: [],
     },
+    assigned: "equipment",
   },
 ];
 
@@ -107,6 +111,7 @@ export const inspectionDemoData: Array<InspectionViewModel> = [
       code: "0456984224498",
       name: "B-Schlauch",
       location: "HLF",
+      commissioned: new Date(),
       equipmentTypeId: "xyz",
       equipmentType: {
         id: "xyz",
@@ -116,6 +121,7 @@ export const inspectionDemoData: Array<InspectionViewModel> = [
       },
       inspections: [],
     },
+    assigned: "equipment",
   },
   {
     id: "jkvshdfg",
@@ -135,6 +141,7 @@ export const inspectionDemoData: Array<InspectionViewModel> = [
       code: "0456984224498",
       name: "B-Schlauch",
       location: "HLF",
+      commissioned: new Date(),
       equipmentTypeId: "xyz",
       equipmentType: {
         id: "xyz",
@@ -144,5 +151,6 @@ export const inspectionDemoData: Array<InspectionViewModel> = [
       },
       inspections: [],
     },
+    assigned: "equipment",
   },
 ];
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 518f81b..8cd2e5f 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -29,14 +29,6 @@ export type InspectionViewModel = {
     }
 );
 
-export interface InspectionPointViewModel {
-  id: string;
-  title: string;
-  description: string;
-  type: "iO-niO" | "text" | "number";
-  min?: number;
-}
-
 export interface InspectionPointResultViewModel {
   inspectionId: string;
   inspectionVersionedPlanId: string;
diff --git a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts
index 0c11ec2..5f2df34 100644
--- a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts
+++ b/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts
@@ -1,7 +1,4 @@
-import type { EquipmentViewModel } from "../equipment/equipment.models";
 import type { EquipmentTypeViewModel } from "../equipmentType/equipmentType.models";
-import type { InspectionPointViewModel } from "../inspection/inspection.models";
-import type { VehicleViewModel } from "../vehicle/vehicle.models";
 import type { VehicleTypeViewModel } from "../vehicleType/vehicleType.models";
 
 export type PlanTimeDefinition = `${number}-${"d" | "m" | "y"}` | `${number}/${number | "*"}`;
@@ -15,15 +12,14 @@ export type InspectionPlanViewModel = {
   created: Date;
   inspectionPoints: InspectionPointViewModel[];
   relatedId: string;
-  related: EquipmentTypeViewModel | VehicleTypeViewModel;
 } & (
   | {
       assigned: "equipment";
-      related: EquipmentViewModel;
+      related: EquipmentTypeViewModel;
     }
   | {
       assigned: "vehicle";
-      related: VehicleViewModel;
+      related: VehicleTypeViewModel;
     }
 );
 
@@ -34,6 +30,14 @@ export interface InspectionVersionedPlanViewModel {
   inspectionPoints: InspectionPointViewModel[];
 }
 
+export interface InspectionPointViewModel {
+  id: string;
+  title: string;
+  description: string;
+  type: "iO-niO" | "text" | "number";
+  min?: number;
+}
+
 export interface CreateInspectionPlanViewModel {
   title: string;
   inspectionInterval: PlanTimeDefinition;