diff --git a/app/handlers/encounter-init.handler.ts b/app/handlers/encounter-init.handler.ts
index 886be1a1..3e1e85f3 100644
--- a/app/handlers/encounter-init.handler.ts
+++ b/app/handlers/encounter-init.handler.ts
@@ -55,23 +55,29 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  earlyNurseryAssessment: {
+    id: 'early-nursery-assessment',
+    title: 'Pengkajian Awal Keperawatan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
   earlyMedicalAssessment: {
     id: 'early-medical-assessment',
     title: 'Pengkajian Awal Medis',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  rehabMedicalAssessment: {
+  earlyMedicalRehabAssessment: {
     id: 'rehab-medical-assessment',
     title: 'Pengkajian Awal Medis Rehabilitasi Medis',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    classCode: ['ambulatory'],
     unit: 'rehab',
     afterId: 'early-medical-assessment',
   },
   functionAssessment: {
     id: 'function-assessment',
     title: 'Asesmen Fungsi',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    classCode: ['ambulatory'],
     unit: 'rehab',
     afterId: 'rehab-medical-assessment',
   },
@@ -102,16 +108,22 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  consent: {
-    id: 'consent',
+  generalConsent: {
+    id: 'general-consent',
     title: 'General Consent',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  patientNote: {
-    id: 'patient-note',
+  patientAmbNote: {
+    id: 'patient-amb-note',
     title: 'CPRJ',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    classCode: ['ambulatory', 'emergency'],
+    unit: 'all',
+  },
+  patientDevNote: {
+    id: 'patient-dev-note',
+    title: 'CPP',
+    classCode: ['inpatient'],
     unit: 'all',
   },
   prescription: {
@@ -120,38 +132,38 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  device: {
+  deviceOrder: {
     id: 'device-order',
     title: 'Order Alkes',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuRadiology: {
-    id: 'mcu-radiology',
+  radiologyOrder: {
+    id: 'radiology-order',
     title: 'Order Radiologi',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuLabPc: {
-    id: 'mcu-lab-pc',
+  cpLabOrder: {
+    id: 'cp-lab-order',
     title: 'Order Lab PK',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuLabMicro: {
-    id: 'mcu-lab-micro',
+  microLabOrder: {
+    id: 'micro-lab-order',
     title: 'Order Lab Mikro',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuLabPa: {
-    id: 'mcu-lab-pa',
+  paLabOrder: {
+    id: 'pa-lab-order',
     title: 'Order Lab PA',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  medicalAction: {
-    id: 'medical-action',
+  actionRoomOrder: {
+    id: 'action-room-order',
     title: 'Order Ruang Tindakan',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
@@ -162,24 +174,48 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  actionReport: {
+    id: 'action-report',
+    title: 'Laporan Tindakan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  surgeryReport: {
+    id: 'surgery-report',
+    title: 'Laporan Operasi',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  vacsinData: {
+    id: 'vacsin-data',
+    title: 'Data Vaksin',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
   consultation: {
     id: 'consultation',
     title: 'Konsultasi',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  resume: {
-    id: 'resume',
-    title: 'Resume',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
-    unit: 'all',
-  },
-  control: {
-    id: 'control',
+  controlLetter: {
+    id: 'control-letter',
     title: 'Surat Kontrol',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  inpatientLetter: {
+    id: 'inpatient-letter',
+    title: 'SPRI',
+    classCode: ['ambulatory', 'emergency'],
+    unit: 'all',
+  },  
+  refBack: {
+    id: 'reference-back',
+    title: 'PRB',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },  
   screening: {
     id: 'screening',
     title: 'Skrinning MPP',
@@ -190,7 +226,19 @@ const defaultKeys: Record<string, any> = {
     id: 'supporting-document',
     title: 'Upload Dokumen Pendukung',
     classCode: ['ambulatory'],
-    unit: 'rehab',
+    unit: 'all',
+  },
+  resume: {
+    id: 'resume',
+    title: 'Resume',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  ambResume: {
+    id: 'amb-resume',
+    title: 'Resume Medis Rawat Jalan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
   },
   priceList: {
     id: 'price-list',
@@ -244,12 +292,12 @@ export function injectComponents(id: string | number, data: EncounterListData, m
       label: currentKeys.earlyMedicalAssessment['title'],
     }
   }
-  if (currentKeys?.rehabMedicalAssessment) {
-    currentKeys.rehabMedicalAssessment['component'] = EarlyMedicalRehabListAsync
-    currentKeys.rehabMedicalAssessment['props'] = {
+  if (currentKeys?.earlyMedicalRehabAssessment) {
+    currentKeys.earlyMedicalRehabAssessment['component'] = EarlyMedicalRehabListAsync
+    currentKeys.earlyMedicalRehabAssessment['props'] = {
       encounter: data?.encounter,
       type: 'early-rehab',
-      label: currentKeys.rehabMedicalAssessment['title'],
+      label: currentKeys.earlyMedicalRehabAssessment['title'],
     }
   }
   if (currentKeys?.functionAssessment) {
@@ -287,44 +335,44 @@ export function injectComponents(id: string | number, data: EncounterListData, m
     currentKeys.educationAssessment['component'] = null
     currentKeys.educationAssessment['props'] = { encounter_id: id }
   }
-  if (currentKeys?.consent) {
-    currentKeys.consent['component'] = GeneralConsentListAsync
-    currentKeys.consent['props'] = { encounter_id: id }
+  if (currentKeys?.generalConsent) {
+    currentKeys.generalConsent['component'] = GeneralConsentListAsync
+    currentKeys.generalConsent['props'] = { encounter_id: id }
   }
-  if (currentKeys?.patientNote) {
-    currentKeys.patientNote['component'] = CprjAsync
-    currentKeys.patientNote['props'] = { encounter_id: id }
+  if (currentKeys?.patientAmbNote) {
+    currentKeys.patientAmbNote['component'] = CprjAsync
+    currentKeys.patientAmbNote['props'] = { encounter_id: id }
   }
   if (currentKeys?.prescription) {
     currentKeys.prescription['component'] = PrescriptionAsync
     currentKeys.prescription['props'] = { encounter_id: id }
   }
-  if (currentKeys?.device) {
-    currentKeys.device['component'] = DeviceOrderAsync
-    currentKeys.device['props'] = { encounter_id: id }
+  if (currentKeys?.deviceOrder) {
+    currentKeys.deviceOrder['component'] = DeviceOrderAsync
+    currentKeys.deviceOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuRadiology) {
-    currentKeys.mcuRadiology['component'] = RadiologyAsync
-    currentKeys.mcuRadiology['props'] = { encounter_id: id }
+  if (currentKeys?.radiologyOrder) {
+    currentKeys.radiologyOrder['component'] = RadiologyAsync
+    currentKeys.radiologyOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuLabPc) {
-    currentKeys.mcuLabPc['component'] = CpLabOrderAsync
-    currentKeys.mcuLabPc['props'] = { encounter_id: id }
+  if (currentKeys?.cpLabOrder) {
+    currentKeys.cpLabOrder['component'] = CpLabOrderAsync
+    currentKeys.cpLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuLabMicro) {
-    // TODO: add component for mcuLabMicro
-    currentKeys.mcuLabMicro['component'] = null
-    currentKeys.mcuLabMicro['props'] = { encounter_id: id }
+  if (currentKeys?.microLabOrder) {
+    // TODO: add component for microLabOrder
+    currentKeys.microLabOrder['component'] = null
+    currentKeys.microLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuLabPa) {
-    // TODO: add component for mcuLabPa
-    currentKeys.mcuLabPa['component'] = null
-    currentKeys.mcuLabPa['props'] = { encounter_id: id }
+  if (currentKeys?.paLabOrder) {
+    // TODO: add component for paLabOrder
+    currentKeys.paLabOrder['component'] = null
+    currentKeys.paLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.medicalAction) {
-    // TODO: add component for medicalAction
-    currentKeys.medicalAction['component'] = null
-    currentKeys.medicalAction['props'] = { encounter_id: id }
+  if (currentKeys?.actionRoomOrder) {
+    // TODO: add component for actionRoomOrder
+    currentKeys.actionRoomOrder['component'] = null
+    currentKeys.actionRoomOrder['props'] = { encounter_id: id }
   }
   if (currentKeys?.mcuResult) {
     // TODO: add component for mcuResult