diff --git a/Common/Models/BaseModel.ts b/Common/Models/BaseModel.ts
index c88000bf19..cfcfdd7fc4 100644
--- a/Common/Models/BaseModel.ts
+++ b/Common/Models/BaseModel.ts
@@ -5,10 +5,10 @@ export default class BaseModel extends BaseEntity {
     id!: string;
 
     @CreateDateColumn()
-    created!: Date;
+    createdAt!: Date;
   
     @UpdateDateColumn()
-    updated!: Date;
+    updatedAt!: Date;
   
     @DeleteDateColumn()
     deletedAt?: Date;
diff --git a/Common/Models/ContainerSecurityLog.ts b/Common/Models/ContainerSecurityLog.ts
index 263c4329b4..3c4cc9facc 100644
--- a/Common/Models/ContainerSecurityLog.ts
+++ b/Common/Models/ContainerSecurityLog.ts
@@ -1,46 +1,24 @@
 import { Column, Entity, Index } from 'typeorm';
 import BaseModel from './BaseModel';
-import User from './User';
-import Project from './Project';
+import ContainerSecurity from './ContainerSecurity';
+import Component from './Component';
+
 @Entity({
-    name: "UserAlerts"
+       name: "ContainerSecurityLog"
 })
-export default class Model extends BaseModel{
- 
- @Column()
-        securityId!: {
- 
- @Column()
-            type!: Schema.Types.ObjectId;
- 
- @Column()
-            ref!: 'ContainerSecurity';
- 
- @Column()
-            index!: true;
-        };
- 
- @Column()
-        componentId!: {
- 
- @Column()
-            type!: Schema.Types.ObjectId;
- 
- @Column()
-            ref!: 'Component';
- 
- @Column()
-            index!: true;
-        };
- 
- @Column()
-        data!: Object;
-        
- 
- @Column()
-        deleteAt!: Date;
-    };
- 
+export default class ContainerSecurityLog extends BaseModel {
+
+       @Column()
+       securityId!: ContainerSecurity
+
+       @Column()
+       componentId!: Component
+
+       @Column()
+       data!: Object;
+
+       @Column()
+       deleteAt!: Date;
 
 }
 
diff --git a/Common/Models/CustomField.ts b/Common/Models/CustomField.ts
index e2dc98041c..6543b7f0d2 100644
--- a/Common/Models/CustomField.ts
+++ b/Common/Models/CustomField.ts
@@ -1,28 +1,30 @@
 import { Column, Entity, Index } from 'typeorm';
 import BaseModel from './BaseModel';
-import User from './User';
 import Project from './Project';
-@Entity({
-    name: "UserAlerts"
-})
-export default class Model extends BaseModel{
- 
- @Column()
-        fieldName!: string;
- 
- @Column()
-        fieldType: { type: string, enum!: ['text', 'number'] };
- 
- @Column()
-        project: Project;
- 
- @Column()
-        uniqueField!: boolean;
-        
- 
 
-    };
- 
+export enum CustomFieldType {
+       Text = 'text',
+       Number = 'number'
+}
+
+@Entity({
+       name: "CustomField"
+})
+export default class CustomField extends BaseModel {
+
+       @Column()
+       fieldName!: string;
+
+       @Column()
+       fieldType!: CustomFieldType;
+
+       @Column()
+       project!: Project;
+
+       @Column()
+       uniqueField!: boolean;
+
+
 
 }
 
diff --git a/Common/Models/IncidentMessage.ts b/Common/Models/IncidentNote.ts
similarity index 88%
rename from Common/Models/IncidentMessage.ts
rename to Common/Models/IncidentNote.ts
index fd5b8413d8..ff16db5e29 100644
--- a/Common/Models/IncidentMessage.ts
+++ b/Common/Models/IncidentNote.ts
@@ -9,9 +9,9 @@ export enum IncidentMessageType{
 }
 
 @Entity({
-   name: "UserAlerts"
+   name: "IncidentNote"
 })
-export default class Model extends BaseModel {
+export default class IncidentNote extends BaseModel {
  
    @Column()
    incident!: Incident
diff --git a/Common/Models/ScheduledEvent.ts b/Common/Models/ScheduledEvent.ts
index 2eb5d91d93..65280d449d 100755
--- a/Common/Models/ScheduledEvent.ts
+++ b/Common/Models/ScheduledEvent.ts
@@ -2,156 +2,99 @@ import { Column, Entity, Index } from 'typeorm';
 import BaseModel from './BaseModel';
 import User from './User';
 import Project from './Project';
+
+export enum ScheduledEventState { 
+       
+}
+
 @Entity({
-    name: "UserAlerts"
+       name: "UserAlerts"
 })
-export default class Model extends BaseModel{
+export default class Model extends BaseModel {
+
+       @Column()
+       project!: Project
+
+       @Column()
+       monitors!: [
+              {
  
  @Column()
-        project!: {
+       monitorId!: {
  
  @Column()
-            type!: string;
- 
- @Column()
-            ref!: 'Project';
- 
- @Column()
-            alias!: 'project';
- 
- @Column()
-            index!: true;
-        };
- 
- @Column()
-        monitors!: [
-            {
- 
- @Column()
-                monitorId!: {
- 
- @Column()
-                    type!: Schema.Types.ObjectId;
- 
- @Column()
-                    ref!: 'Monitor';
- 
- @Column()
-                    index!: true;
-                };
+       type!: Schema.Types.ObjectId;
+
+       @Column()
+       ref!: 'Monitor';
+
+       @Column()
+       index!: true;
+};
             };
         ];
- 
- @Column()
-        name!: string;
- 
- @Column()
-        cancelled!: boolean;
- 
- @Column()
-        cancelledAt!: Date;
 
- 
- @Column()
-        cancelledById!: {
- 
- @Column()
-            type!: string;
- 
- @Column()
-            ref!: 'User';
- 
- @Column()
-            index!: true;
-        };
- 
- @Column()
-        slug!: string;
- 
- @Column()
-        createdByUser!: {
- 
- @Column()
-            type!: string;
- 
- @Column()
-            ref!: 'User';
- 
- @Column()
-            index!: true;
-        };
+@Column()
+name!: string;
 
-        
- 
- 
- 
- @Column()
-        deletedByUser!: {
- 
- @Column()
-            type!: string;
- 
- @Column()
-            ref!: 'User';
- 
- @Column()
-            index!: true;
-        };
- 
- @Column()
-        startDate!: {
- 
- @Column()
-            type!: Date;
-        };
- 
- @Column()
-        endDate!: {
- 
- @Column()
-            type!: Date;
-        };
- 
- @Column()
-        description!: {
- 
- @Column()
-            type!: string;
-        };
- 
- @Column()
-        showEventOnStatusPage!: boolean;
- 
- @Column()
-        callScheduleOnEvent!: boolean;
- 
- @Column()
-        monitorDuringEvent!: boolean;
- 
- @Column()
-        recurring!: boolean;
- 
- @Column()
-        interval!: {
- 
- @Column()
-            type!: string;
- 
- @Column()
-            default!: null;
-        };
- 
- @Column()
-        alertSubscriber!: boolean;
- 
- @Column()
-        resolved!: boolean;
- 
- @Column()
-        resolvedBy: User;
- 
- @Column()
-        resolvedAt!: Date;
+@Column()
+cancelled!: boolean;
+
+@Column()
+cancelledAt!: Date;
+
+
+@Column()
+cancelledById!: User
+
+@Column()
+slug!: string;
+
+@Column()
+createdByUser!: User
+
+
+
+
+
+@Column()
+deletedByUser!: User
+
+@Column()
+startDate!: Date
+
+@Column()
+endDate!: Date
+
+@Column()
+description!: string
+
+@Column()
+showEventOnStatusPage!: boolean;
+
+@Column()
+callScheduleOnEvent!: boolean;
+
+@Column()
+monitorDuringEvent!: boolean;
+
+@Column()
+recurring!: boolean;
+
+@Column()
+interval!: string
+
+@Column()
+alertSubscriber!: boolean;
+
+@Column()
+resolved!: boolean;
+
+@Column()
+resolvedBy!: User;
+
+@Column()
+resolvedAt!: Date;
     };
  
 
diff --git a/Common/Models/ScheduledEventNote.ts b/Common/Models/ScheduledEventNote.ts
index 502c2079cf..83e8f330c3 100644
--- a/Common/Models/ScheduledEventNote.ts
+++ b/Common/Models/ScheduledEventNote.ts
@@ -2,57 +2,39 @@ import { Column, Entity, Index } from 'typeorm';
 import BaseModel from './BaseModel';
 import User from './User';
 import Project from './Project';
+import ScheduledEvent, { ScheduledEventState } from './ScheduledEvent';
+
+export enum ScheduledEventNote {
+       Investogation = "Investigation",
+       Internam = "Internal"
+}
+
+
 @Entity({
-    name: "UserAlerts"
+       name: "UserAlerts"
 })
-export default class Model extends BaseModel{
- 
- @Column()
-        scheduledEventId!: {
- 
- @Column()
-            type!: Schema.Types.ObjectId;
- 
- @Column()
-            ref!: 'ScheduledEvent';
- 
- @Column()
-            index!: true;
-        };
- 
- @Column()
-        content!: string;
- 
- @Column()
-        type!: {
- 
- @Column()
-            type!: string;
- 
- @Column()
-            enum!: ['investigation', 'internal'];
- 
- @Column()
-            required!: true;
-        };
- 
- @Column()
-        event_state!: string;
- 
- @Column()
-        createdByUser: User;
- 
- @Column()
-        updated!: boolean;
-        
- 
+export default class Model extends BaseModel {
 
- 
- @Column()
-        deletedByUser: User;
-    };
- 
+       @Column()
+       scheduledEventId!: ScheduledEvent
 
+       @Column()
+       content!: string;
+
+       @Column()
+       type!: ScheduledEventNote
+
+       @Column()
+       eventState!: ScheduledEventState;
+
+       @Column()
+       createdByUser!: User;
+
+       @Column()
+       updated!: boolean;
+
+       @Column()
+       deletedByUser!: User;
 }