diff --git a/Server/db/models/HardwareCheck.js b/Server/db/models/HardwareCheck.js
index 5e7f53329..c307b9804 100644
--- a/Server/db/models/HardwareCheck.js
+++ b/Server/db/models/HardwareCheck.js
@@ -36,11 +36,31 @@ const HardwareCheckSchema = mongoose.Schema(
 			type: mongoose.Schema.Types.ObjectId,
 			ref: "Monitor",
 			immutable: true,
+			index: true,
 		},
+
 		status: {
 			type: Boolean,
 			index: true,
 		},
+
+		responseTime: {
+			type: Number,
+		},
+
+		statusCode: {
+			type: Number,
+			index: true,
+		},
+
+		message: {
+			type: String,
+		},
+		expiry: {
+			type: Date,
+			default: Date.now,
+			expires: 60 * 60 * 24 * 30, // 30 days
+		},
 		cpu: {
 			type: cpuSchema,
 			default: () => ({}),