diff --git a/app/components/content/installation/list.vue b/app/components/content/installation/list.vue
index be0501cf..d836581d 100644
--- a/app/components/content/installation/list.vue
+++ b/app/components/content/installation/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // Components
-import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
 import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
 import AppInstallationList from '~/components/app/installation/list.vue'
@@ -28,11 +28,12 @@ import {
   handleActionRemove,
   handleCancelForm,
 } from '~/handlers/installation.handler'
-import { encounterClasses, getEncounterClassConstants } from '~/handlers/_shared.handler'
 
 // Services
-import { getInstallations, getInstallationDetail } from '~/services/installation.service'
+import { getList, getDetail } from '~/services/installation.service'
+import { getValueLabelListConstants as getEncounterList } from '~/services/encounter.service'
 
+const encounterClasses = ref<{ value: string; label: string }[]>([])
 const title = ref('')
 
 const {
@@ -45,10 +46,10 @@ const {
   fetchData: getInstallationList,
 } = usePaginatedList({
   fetchFn: async (params: any) => {
-    // TODO: use pagination params
-    const result = await getInstallations({
+    const result = await getList({
       search: params.search,
-      // page: params['page-number'] || 0,
+      'page-number': params['page-number'] || 0, 
+      'page-size': params['page-size'] || 10,
     })
     return { success: result.success || false, body: result.body || {} }
   },
@@ -87,7 +88,7 @@ provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
 const getCurrentInstallationDetail = async (id: number | string) => {
-  const result = await getInstallationDetail(id)
+  const result = await getDetail(id)
   if (result.success) {
     const currentValue = result.body?.data || {}
     recItem.value = currentValue
@@ -115,8 +116,8 @@ watch([recId, recAction], () => {
 })
 
 onMounted(async () => {
+  encounterClasses.value = getEncounterList()
   await getInstallationList()
-  await getEncounterClassConstants()
 })
 </script>
 
diff --git a/app/components/content/medicine-group/list.vue b/app/components/content/medicine-group/list.vue
index 0beaae84..8d45843f 100644
--- a/app/components/content/medicine-group/list.vue
+++ b/app/components/content/medicine-group/list.vue
@@ -30,7 +30,7 @@ import {
 } from '~/handlers/medicine-group.handler'
 
 // Services
-import { getMedicineGroups, getMedicineGroupDetail } from '~/services/medicine-group.service'
+import { getList, getDetail } from '~/services/medicine-group.service'
 
 const title = ref('')
 
@@ -44,7 +44,11 @@ const {
   fetchData: getMedicineGroupList,
 } = usePaginatedList({
   fetchFn: async (params: any) => {
-    const result = await getMedicineGroups({ search: params.search, page: params['page-number'] || 0 })
+    const result = await getList({
+      search: params.search,
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'medicine-group',
@@ -82,7 +86,7 @@ provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
 const getCurrentMedicineGroupDetail = async (id: number | string) => {
-  const result = await getMedicineGroupDetail(id)
+  const result = await getDetail(id)
   if (result.success) {
     const currentValue = result.body?.data || {}
     recItem.value = currentValue
diff --git a/app/components/content/medicine-method/list.vue b/app/components/content/medicine-method/list.vue
index 928e5eea..f6ddf86b 100644
--- a/app/components/content/medicine-method/list.vue
+++ b/app/components/content/medicine-method/list.vue
@@ -30,7 +30,7 @@ import {
 } from '~/handlers/medicine-method.handler'
 
 // Services
-import { getMedicineMethods, getMedicineMethodDetail } from '~/services/medicine-method.service'
+import { getList, getDetail } from '~/services/medicine-method.service'
 
 const title = ref('')
 
@@ -44,7 +44,11 @@ const {
   fetchData: getMedicineMethodList,
 } = usePaginatedList({
   fetchFn: async (params: any) => {
-    const result = await getMedicineMethods({ search: params.search, page: params['page-number'] || 0 })
+    const result = await getList({
+      search: params.search,
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'medicine-method',
@@ -82,7 +86,7 @@ provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
 const getCurrentMedicineMethodDetail = async (id: number | string) => {
-  const result = await getMedicineMethodDetail(id)
+  const result = await getDetail(id)
   if (result.success) {
     const currentValue = result.body?.data || {}
     recItem.value = currentValue
diff --git a/app/components/content/medicine/list.vue b/app/components/content/medicine/list.vue
index 1df107c9..d52c0ea4 100644
--- a/app/components/content/medicine/list.vue
+++ b/app/components/content/medicine/list.vue
@@ -31,18 +31,16 @@ import {
   handleActionRemove,
   handleCancelForm,
 } from '~/handlers/medicine.handler'
-import {
-  medicineGroups,
-  medicineMethods,
-  uoms,
-  getMedicineGroupList,
-  getMedicineMethodList,
-  getUomList,
-} from '~/handlers/_shared.handler'
 
 // Services
-import { getMedicines, getMedicineDetail } from '~/services/medicine.service'
+import { getList, getDetail } from '~/services/medicine.service'
+import { getValueLabelList as getMedicineGroupList } from '~/services/medicine-group.service'
+import { getValueLabelList as getMedicineMethodList } from '~/services/medicine-method.service'
+import { getValueLabelList as getUomList } from '~/services/uom.service'
 
+const medicineGroups = ref<{ value: string; label: string }[]>([])
+const medicineMethods = ref<{ value: string; label: string }[]>([])
+const uoms = ref<{ value: string; label: string }[]>([])
 const title = ref('')
 
 const {
@@ -55,9 +53,10 @@ const {
   fetchData: getMedicineList,
 } = usePaginatedList({
   fetchFn: async (params: any) => {
-    const result = await getMedicines({
+    const result = await getList({
       search: params.search,
-      page: params['page-number'] || 0,
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
       includes: 'medicineGroup,medicineMethod,uom',
     })
     return { success: result.success || false, body: result.body || {} }
@@ -97,7 +96,7 @@ provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
 const getCurrentMedicineDetail = async (id: number | string) => {
-  const result = await getMedicineDetail(id)
+  const result = await getDetail(id)
   if (result.success) {
     const currentValue = result.body?.data || {}
     recItem.value = currentValue
@@ -124,10 +123,10 @@ watch([recId, recAction], () => {
 })
 
 onMounted(async () => {
+  medicineGroups.value = await getMedicineGroupList()
+  medicineMethods.value = await getMedicineMethodList()
+  uoms.value = await getUomList()
   await getMedicineList()
-  await getMedicineGroupList()
-  await getMedicineMethodList()
-  await getUomList()
 })
 </script>
 
diff --git a/app/handlers/_shared.handler.ts b/app/handlers/_shared.handler.ts
index 6fd51a85..eb6b9bf4 100644
--- a/app/handlers/_shared.handler.ts
+++ b/app/handlers/_shared.handler.ts
@@ -1,12 +1,5 @@
-
-
 // variables
-export const medicineGroups = ref<{ value: string; label: string }[]>([])
-export const medicineMethods = ref<{ value: string; label: string }[]>([])
-export const encounterClasses = ref<{ value: string; label: string }[]>([])
-export const divisions = ref<{ value: string | number; label: string }[]>([])
 export const installations = ref<{ value: string; label: string }[]>([])
 export const specialists = ref<{ value: string | number; label: string }[]>([])
-export const uoms = ref<{ value: string; label: string }[]>([])
 export const units = ref<{ value: string | number; label: string }[]>([])