diff --git a/data/kl/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/kl/ACCESSCONTROL-ACTIONS-TEST/actions-test.json
index 1fb9c18..3c48d7f 100644
--- a/data/kl/ACCESSCONTROL-ACTIONS-TEST/actions-test.json
+++ b/data/kl/ACCESSCONTROL-ACTIONS-TEST/actions-test.json
@@ -414,7 +414,7 @@
     {
       "id": 2552,
       "name": "Create Advocate ",
-      "url": "/advocate/advocate/v1/_create",
+      "url": "/advocate/v1/_create",
       "displayName": "Create Advocate",
       "orderNumber": 0,
       "enabled": false,
@@ -425,7 +425,7 @@
     {
       "id": 2553,
       "name": "Update Advocate ",
-      "url": "/advocate/advocate/v1/_update",
+      "url": "/advocate/v1/_update",
       "displayName": "Update Advocate",
       "orderNumber": 0,
       "enabled": false,
@@ -436,7 +436,7 @@
     {
       "id": 2554,
       "name": "Search Advocate",
-      "url": "/advocate/advocate/v1/_search",
+      "url": "/advocate/v1/_search",
       "displayName": "Search Advocate",
       "orderNumber": 0,
       "enabled": false,
@@ -2050,7 +2050,7 @@
       {
          "id": 2510,
          "name": "MDMS v2 Search",
-         "url": "/mdms-v2/schema/v1/_search",
+         "url": "/egov-mdms-service/schema/v1/_search",
          "parentModule": "",
          "displayName": "MDMS v2",
          "orderNumber": 1,
diff --git a/data/kl/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/kl/ACCESSCONTROL-ROLEACTIONS/roleactions.json
index 91a5f04..19f8fed 100644
--- a/data/kl/ACCESSCONTROL-ROLEACTIONS/roleactions.json
+++ b/data/kl/ACCESSCONTROL-ROLEACTIONS/roleactions.json
@@ -2,54 +2,6 @@
   "tenantId": "kl",
   "moduleName": "ACCESSCONTROL-ROLEACTIONS",
   "roleactions": [
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 1429,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 1429,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 1429,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 729,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 730,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 726,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 623,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 623,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "SUPERUSER",
       "actionid": 870,
@@ -74,12 +26,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2548,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "SUPERUSER",
       "actionid": 2549,
@@ -98,12 +44,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2549,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "SUPERUSER",
       "actionid": 605,
@@ -176,12 +116,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "MDMS_ADMIN",
-      "actionid": 699,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "SUPERUSER",
       "actionid": 1529,
@@ -189,13 +123,7 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "EMPLOYEE",
-      "actionid": 1529,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
+      "rolecode": "LOC_ADMIN",
       "actionid": 1529,
       "actioncode": "",
       "tenantId": "kl"
@@ -225,31 +153,13 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "EMPLOYEE",
+      "rolecode": "LOC_ADMIN",
       "actionid": 1530,
       "actioncode": "",
       "tenantId": "kl"
     },
     {
-      "rolecode": "SUPERUSER",
-      "actionid": 691,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 692,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 693,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
+      "rolecode": "MDMS_ADMIN",
       "actionid": 954,
       "actioncode": "",
       "tenantId": "kl"
@@ -261,13 +171,7 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "ADVOCATE_APPROVER",
-      "actionid": 1741,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "ADVOCATE_CLERK_APPROVER",
+      "rolecode": "SYSTEM_ADMIN",
       "actionid": 1741,
       "actioncode": "",
       "tenantId": "kl"
@@ -290,18 +194,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "ADVOCATE_APPROVER",
-      "actionid": 1743,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "ADVOCATE_CLERK_APPROVER",
-      "actionid": 1743,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "EMPLOYEE",
       "actionid": 1729,
@@ -314,36 +206,12 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "ADVOCATE_APPROVER",
-      "actionid": 1729,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "ADVOCATE_CLERK_APPROVER",
-      "actionid": 1729,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "SUPERUSER",
       "actionid": 1742,
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "ADVOCATE_APPROVER",
-      "actionid": 1742,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "ADVOCATE_CLERK_APPROVER",
-      "actionid": 1742,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "EMPLOYEE",
       "actionid": 1730,
@@ -362,18 +230,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "ADVOCATE_APPROVER",
-      "actionid": 1730,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "ADVOCATE_CLERK_APPROVER",
-      "actionid": 1730,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "EMPLOYEE",
       "actionid": 2317,
@@ -441,7 +297,7 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "EMPLOYEE",
+      "rolecode": "HRMS_ADMIN",
       "actionid": 1751,
       "actioncode": "",
       "tenantId": "kl"
@@ -470,12 +326,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2550,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "CITIZEN",
       "actionid": 2552,
@@ -585,44 +435,8 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2312,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2312,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 1830,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 1830,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 1830,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2490,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2490,
+      "rolecode": "MDMS_ADMIN",
+      "actionid": 2511,
       "actioncode": "",
       "tenantId": "kl"
     },
@@ -668,24 +482,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "CASE_EDITOR",
-      "actionid": 2559,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CASE_EDITOR",
-      "actionid": 2560,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CASE_EDITOR",
-      "actionid": 2561,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "EMPLOYEE",
       "actionid": 2562,
@@ -698,18 +494,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "ADVOCATE_APPROVER",
-      "actionid": 2562,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "ADVOCATE_CLERK_APPROVER",
-      "actionid": 2562,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "SUPERUSER",
       "actionid": 1734,
@@ -752,18 +536,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2564,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2565,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "ORDER_APPROVER",
       "actionid": 2565,
@@ -914,12 +686,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "HEARING_ACCEPTOR",
-      "actionid": 2576,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "HEARING_CLOSER",
       "actionid": 2576,
@@ -944,12 +710,6 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "HEARING_ACCEPTOR",
-      "actionid": 2577,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "HEARING_CLOSER",
       "actionid": 2577,
@@ -963,83 +723,23 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "WORKFLOW_ADMIN",
+      "rolecode": "SYSTEM",
       "actionid": 2575,
       "actioncode": "",
       "tenantId": "kl"
     },
     {
-      "rolecode": "WORKFLOW_ADMIN",
+      "rolecode": "SYSTEM",
       "actionid": 2576,
       "actioncode": "",
       "tenantId": "kl"
     },
     {
-      "rolecode": "WORKFLOW_ADMIN",
+      "rolecode": "SYSTEM",
       "actionid": 2577,
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "MDMS_ADMIN",
-      "actionid": 2579,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2580,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2581,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "EMPLOYEE",
-      "actionid": 2582,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2580,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2581,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "CITIZEN",
-      "actionid": 2582,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 2580,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 2581,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "SUPERUSER",
-      "actionid": 2582,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "MDMS_ADMIN",
       "actionid": 2583,
@@ -1262,60 +962,18 @@
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "TASK_APPROVER",
-      "actionid": 2614,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "TASK_CLOSER",
-      "actionid": 2614,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "TASK_REJECTOR",
-      "actionid": 2614,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "TASK_RESPONDER",
       "actionid": 2616,
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "TASK_REASSIGN",
-      "actionid": 2614,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "TASK_UPDATOR",
       "actionid": 2614,
       "actioncode": "",
       "tenantId": "kl"
     },
-    {
-      "rolecode": "TASK_APPROVER",
-      "actionid": 2615,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "TASK_CLOSER",
-      "actionid": 2615,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
-    {
-      "rolecode": "TASK_REJECTOR",
-      "actionid": 2615,
-      "actioncode": "",
-      "tenantId": "kl"
-    },
     {
       "rolecode": "TASK_VIEWER",
       "actionid": 2615,
@@ -1779,7 +1437,7 @@
       "tenantId": "kl"
     },
     {
-      "rolecode": "NYAY_MITRA_ROLE",
+      "rolecode": "EMPLOYEE",
       "actionid": 2649,
       "actioncode": "",
       "tenantId": "kl"
diff --git a/data/kl/ACCESSCONTROL-ROLES/roles.json b/data/kl/ACCESSCONTROL-ROLES/roles.json
index 55f23b1..c5134a5 100644
--- a/data/kl/ACCESSCONTROL-ROLES/roles.json
+++ b/data/kl/ACCESSCONTROL-ROLES/roles.json
@@ -78,9 +78,9 @@
             "description": "APPLICATION_VIEWER"
         },
         {
-            "code": "WORKFLOW_ADMIN",
-            "name": "Workflow Admin",
-            "description": "Person who has authority to abandon or edit workflow"
+            "code": "SYSTEM",
+            "name": "SYSTEM",
+            "description": "SYSTEM"
         },
         {
             "code": "HEARING_CREATOR",