diff --git a/i18n/en.pot b/i18n/en.pot
index 24233611..d7f440d5 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,13 +5,13 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2025-01-21T08:14:43.180Z\n"
-"PO-Revision-Date: 2025-01-21T08:14:43.180Z\n"
+"POT-Creation-Date: 2025-08-21T17:39:05.618Z\n"
+"PO-Revision-Date: 2025-08-21T17:39:05.618Z\n"
 
-msgid "<No value>"
+msgid "0"
 msgstr ""
 
-msgid "- All -"
+msgid "<No value>"
 msgstr ""
 
 msgid "LOG OUT"
@@ -58,16 +58,6 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"Module 1 totals with missing sum or sum that does not match the "
-"auto-calculated"
-msgstr ""
-
-msgid ""
-"Module 1 (Subnational single entry) totals with missing sum or sum that "
-"does not match the auto-calculated"
-msgstr ""
-
 msgid "Metadata Admin Report"
 msgstr ""
 
@@ -617,79 +607,94 @@ msgstr ""
 msgid "Error when trying to check difference in data values"
 msgstr ""
 
-msgid "Malaria Data Approval Report"
+msgid "Data Approval Report"
 msgstr ""
 
-msgid "Data set"
+msgid "Complete"
 msgstr ""
 
-msgid "Attribute"
+msgid "Incomplete"
 msgstr ""
 
-msgid "Completion status"
+msgid "Submit"
 msgstr ""
 
-msgid "Submission status"
+msgid "Revoke"
 msgstr ""
 
-msgid "Modification Count"
+msgid "Check Difference"
 msgstr ""
 
-msgid "Last modification date"
+msgid "Check differences"
 msgstr ""
 
-msgid "Last date of submission"
+msgid "Submitted"
 msgstr ""
 
-msgid "Last date of approval"
+msgid "Ready for submission"
 msgstr ""
 
-msgid "Complete"
+msgid "Not Approved"
 msgstr ""
 
-msgid "Error when trying to complete data set"
+msgid "Greater than 0"
 msgstr ""
 
-msgid "Incomplete"
+msgid "Data sets"
 msgstr ""
 
-msgid "Error when trying to incomplete data set"
+msgid "Periods"
 msgstr ""
 
-msgid "Submit"
+msgid "Completion status"
 msgstr ""
 
-msgid "Error when trying to submit data set"
+msgid "Submission status"
 msgstr ""
 
-msgid "Revoke"
+msgid "Approval status"
+msgstr ""
+
+msgid "Modification Count"
+msgstr ""
+
+msgid "Error when trying to approve data set"
+msgstr ""
+
+msgid "Completing dataset"
+msgstr ""
+
+msgid "Updating status to incomplete"
+msgstr ""
+
+msgid "Revoking dataset"
 msgstr ""
 
 msgid "Error when trying to unsubmit data set"
 msgstr ""
 
-msgid "Activate monitoring"
+msgid "Submitting dataset"
 msgstr ""
 
-msgid "Deactivate monitoring"
+msgid "Error when trying to submit data set"
 msgstr ""
 
-msgid "Check Difference"
+msgid "Data set"
 msgstr ""
 
-msgid "Check differences"
+msgid "Attribute"
 msgstr ""
 
-msgid "Submitted"
+msgid "Not approved"
 msgstr ""
 
-msgid "Ready for submission"
+msgid "Last modification date"
 msgstr ""
 
-msgid "Data sets"
+msgid "Last date of submission"
 msgstr ""
 
-msgid "Periods"
+msgid "Last date of approval"
 msgstr ""
 
 msgid "Malaria Data Subscription Report"
@@ -749,16 +754,16 @@ msgstr ""
 msgid "NHWA Data Approval Status Report"
 msgstr ""
 
-msgid "Approval status"
+msgid "Last updated value"
 msgstr ""
 
-msgid "Last updated value"
+msgid "Error when trying to complete data set"
 msgstr ""
 
-msgid "Approving data sets..."
+msgid "Error when trying to incomplete data set"
 msgstr ""
 
-msgid "Error when trying to approve data set"
+msgid "Approving data sets..."
 msgstr ""
 
 msgid "Unapprove"
diff --git a/i18n/es.po b/i18n/es.po
index 67da66b2..44b7a6d9 100644
--- a/i18n/es.po
+++ b/i18n/es.po
@@ -1,17 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2025-01-21T08:14:12.526Z\n"
+"POT-Creation-Date: 2025-08-21T17:39:05.618Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-msgid "<No value>"
+msgid "0"
 msgstr ""
 
-msgid "- All -"
+msgid "<No value>"
 msgstr ""
 
 msgid "LOG OUT"
@@ -58,16 +58,6 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-msgid ""
-"Module 1 totals with missing sum or sum that does not match the auto-"
-"calculated"
-msgstr ""
-
-msgid ""
-"Module 1 (Subnational single entry) totals with missing sum or sum that does "
-"not match the auto-calculated"
-msgstr ""
-
 msgid "Metadata Admin Report"
 msgstr ""
 
@@ -618,79 +608,94 @@ msgstr ""
 msgid "Error when trying to check difference in data values"
 msgstr ""
 
-msgid "Malaria Data Approval Report"
+msgid "Data Approval Report"
 msgstr ""
 
-msgid "Data set"
+msgid "Complete"
 msgstr ""
 
-msgid "Attribute"
+msgid "Incomplete"
 msgstr ""
 
-msgid "Completion status"
+msgid "Submit"
 msgstr ""
 
-msgid "Submission status"
+msgid "Revoke"
 msgstr ""
 
-msgid "Modification Count"
+msgid "Check Difference"
 msgstr ""
 
-msgid "Last modification date"
+msgid "Check differences"
 msgstr ""
 
-msgid "Last date of submission"
+msgid "Submitted"
 msgstr ""
 
-msgid "Last date of approval"
+msgid "Ready for submission"
 msgstr ""
 
-msgid "Complete"
+msgid "Not Approved"
 msgstr ""
 
-msgid "Error when trying to complete data set"
+msgid "Greater than 0"
 msgstr ""
 
-msgid "Incomplete"
+msgid "Data sets"
 msgstr ""
 
-msgid "Error when trying to incomplete data set"
+msgid "Periods"
 msgstr ""
 
-msgid "Submit"
+msgid "Completion status"
 msgstr ""
 
-msgid "Error when trying to submit data set"
+msgid "Submission status"
 msgstr ""
 
-msgid "Revoke"
+msgid "Approval status"
+msgstr ""
+
+msgid "Modification Count"
+msgstr ""
+
+msgid "Error when trying to approve data set"
+msgstr ""
+
+msgid "Completing dataset"
+msgstr ""
+
+msgid "Updating status to incomplete"
+msgstr ""
+
+msgid "Revoking dataset"
 msgstr ""
 
 msgid "Error when trying to unsubmit data set"
 msgstr ""
 
-msgid "Activate monitoring"
+msgid "Submitting dataset"
 msgstr ""
 
-msgid "Deactivate monitoring"
+msgid "Error when trying to submit data set"
 msgstr ""
 
-msgid "Check Difference"
+msgid "Data set"
 msgstr ""
 
-msgid "Check differences"
+msgid "Attribute"
 msgstr ""
 
-msgid "Submitted"
+msgid "Not approved"
 msgstr ""
 
-msgid "Ready for submission"
+msgid "Last modification date"
 msgstr ""
 
-msgid "Data sets"
+msgid "Last date of submission"
 msgstr ""
 
-msgid "Periods"
+msgid "Last date of approval"
 msgstr ""
 
 msgid "Malaria Data Subscription Report"
@@ -750,16 +755,16 @@ msgstr ""
 msgid "NHWA Data Approval Status Report"
 msgstr ""
 
-msgid "Approval status"
+msgid "Last updated value"
 msgstr ""
 
-msgid "Last updated value"
+msgid "Error when trying to complete data set"
 msgstr ""
 
-msgid "Approving data sets..."
+msgid "Error when trying to incomplete data set"
 msgstr ""
 
-msgid "Error when trying to approve data set"
+msgid "Approving data sets..."
 msgstr ""
 
 msgid "Unapprove"
diff --git a/package.json b/package.json
index 7d577ba1..864e60c9 100644
--- a/package.json
+++ b/package.json
@@ -100,8 +100,8 @@
         "data-quality-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_data_quality",
         "mal-subscription-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_mal_subscription",
         "nhwa-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_nhwa",
-        "mal-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48='mal-icon.png' --manifest.name='DHIS2 MAL Approval Report' --manifest.description='DHIS2 MAL Approval Report'",
-        "mal-build-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48 mal-icon.png --manifest.name='DHIS2 MAL Approval Report' --manifest.description='DHIS2 MAL Approval Report'",
+        "mal-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48='mal-icon.png' --manifest.name='NHWA Approval Report' --manifest.description='NHWA Approval Report'",
+        "mal-build-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48 mal-icon.png --manifest.name='NHWA Approval Report' --manifest.description='NHWA Approval Report'",
         "glass-admin-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_glass_admin --manifest.icons.48='glass-icon.png' --manifest.name='DHIS2 GLASS Admin Maintenance Report' --manifest.description='DHIS2 GLASS Admin Maintenance Report'",
         "glass-admin-build-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_glass_admin --manifest.icons.48 glass-icon.png --manifest.name='DHIS2 GLASS Admin Maintenance Report' --manifest.description='DHIS2 GLASS Admin Maintenance Report'",
         "glass-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_glass --manifest.icons.48='glass-icon.png' --manifest.name='DHIS2 GLASS Submission Report' --manifest.description='DHIS2 GLASS Submission Report'",
diff --git a/public/index.html b/public/index.html
index 560c1327..e3d2b9ed 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,16 +4,9 @@
         <meta charset="utf-8" />
         <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
 
-        <link
-            type="text/css"
-            rel="stylesheet"
-            href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css"
-        />
+        <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css" />
         <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/roboto-font.css" />
-        <link
-            href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"
-            rel="stylesheet"
-        />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet" />
 
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
         <meta name="theme-color" content="#000000" />
@@ -26,20 +19,10 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <% if (process.env.REACT_APP_REPORT_VARIANT==='mal-approval-status' ) { %>
-        <title>DHIS2 MAL Approval Report</title>
-    <% } else if (process.env.REACT_APP_REPORT_VARIANT==='glass-submission' ) { %>
-        <title>DHIS2 GLASS Submission Report</title>
-    <% } else if (process.env.REACT_APP_REPORT_VARIANT==='glass-admin' ) { %>
-        <title>DHIS2 GLASS Admin Maintenance Report</title>
-    <% } else { %>
-        <title>DHIS2 Reports</title>
-    <% } %>
+        <title>Approval Report</title>
     </head>
     <body>
-        <noscript>
-            You need to enable JavaScript to run this app.
-        </noscript>
+        <noscript> You need to enable JavaScript to run this app. </noscript>
         <div id="root"></div>
         <!--
       This HTML file is a template.
diff --git a/public/manifest_mal.json b/public/manifest_mal.json
index 299106b3..ab4420cb 100644
--- a/public/manifest_mal.json
+++ b/public/manifest_mal.json
@@ -1,6 +1,6 @@
 {
-    "short_name": "DHIS2 MAL Approval Report",
-    "name": "DHIS2 MAL Approval Report",
+    "short_name": "NHWA Approval Report",
+    "name": "NHWA Approval Report",
     "icons": [
         {
             "src": "favicon.ico",
@@ -12,4 +12,4 @@
     "display": "standalone",
     "theme_color": "#000000",
     "background_color": "#ffffff"
-}
\ No newline at end of file
+}
diff --git a/src/compositionRoot.ts b/src/compositionRoot.ts
index 4fd673f5..804e17f7 100644
--- a/src/compositionRoot.ts
+++ b/src/compositionRoot.ts
@@ -108,6 +108,10 @@ import { OrgUnitWithChildrenD2Repository } from "./data/reports/mal-data-approva
 import { UpdateMonitoringUseCase } from "./domain/reports/mal-data-approval/usecases/UpdateMonitoringUseCase";
 import { UserGroupD2Repository } from "./data/reports/mal-data-approval/UserGroupD2Repository";
 import { MonitoringValueDataStoreRepository } from "./data/reports/mal-data-approval/MonitoringValueDataStoreRepository";
+import { AppSettingsD2Repository } from "./data/AppSettingsD2Repository";
+import { GetAppSettingsUseCase } from "./domain/usecases/GetAppSettingsUseCase";
+import { DataSetStatusD2Repository } from "./data/DataSetStatusD2Repository";
+import { GetDataSetStatusUseCase } from "./domain/usecases/GetDataSetStatusUseCase";
 
 export function getCompositionRoot(api: D2Api) {
     const configRepository = new Dhis2ConfigRepository(api, getReportType());
@@ -135,8 +139,16 @@ export function getCompositionRoot(api: D2Api) {
     const orgUnitsWithChildrenRepository = new OrgUnitWithChildrenD2Repository(api);
     const userGroupRepository = new UserGroupD2Repository(api);
     const monitoringValueRepository = new MonitoringValueDataStoreRepository(api);
+    const appSettingsRepository = new AppSettingsD2Repository();
+    const dataSetStatusRepository = new DataSetStatusD2Repository(api);
 
     return {
+        dataSetStatus: {
+            get: new GetDataSetStatusUseCase(dataSetStatusRepository),
+        },
+        appSettings: {
+            get: new GetAppSettingsUseCase(appSettingsRepository),
+        },
         admin: getExecute({
             get: new GetWIDPAdminDefaultUseCase(widpAdminDefaultRepository),
             save: new SaveWIDPAdminDefaultCsvUseCase(widpAdminDefaultRepository),
@@ -157,9 +169,10 @@ export function getCompositionRoot(api: D2Api) {
                 dataDuplicationRepository,
                 dataValuesRepository,
                 dataSetRepository,
-                monitoringValueRepository
+                monitoringValueRepository,
+                appSettingsRepository
             ),
-            getDiff: new GetMalDataDiffUseCase(dataValuesRepository, dataSetRepository),
+            getDiff: new GetMalDataDiffUseCase(dataValuesRepository, dataSetRepository, appSettingsRepository),
             save: new SaveMalDataSetsUseCase(dataDuplicationRepository),
             getColumns: new GetMalDataApprovalColumnsUseCase(dataDuplicationRepository),
             saveColumns: new SaveMalDataApprovalColumnsUseCase(dataDuplicationRepository),
@@ -168,7 +181,8 @@ export function getCompositionRoot(api: D2Api) {
             updateStatus: new UpdateMalApprovalStatusUseCase(
                 dataDuplicationRepository,
                 dataValuesRepository,
-                dataSetRepository
+                dataSetRepository,
+                appSettingsRepository
             ),
             duplicateValue: new DuplicateDataValuesUseCase(dataDuplicationRepository),
             getSortOrder: new GetSortOrderUseCase(dataDuplicationRepository),
diff --git a/src/data/AppSettingsD2Repository.ts b/src/data/AppSettingsD2Repository.ts
new file mode 100644
index 00000000..25f14325
--- /dev/null
+++ b/src/data/AppSettingsD2Repository.ts
@@ -0,0 +1,15 @@
+import { AppSettings } from "../domain/common/entities/AppSettings";
+import { AppSettingsRepository } from "../domain/common/repositories/AppSettingsRepository";
+import { D2ApprovalReport } from "./D2ApprovalReport";
+
+export class AppSettingsD2Repository implements AppSettingsRepository {
+    private d2ApprovalReport: D2ApprovalReport;
+
+    constructor() {
+        this.d2ApprovalReport = new D2ApprovalReport();
+    }
+
+    get(): Promise<AppSettings> {
+        return Promise.resolve(this.d2ApprovalReport.get());
+    }
+}
diff --git a/src/data/ApprovalReportData.ts b/src/data/ApprovalReportData.ts
new file mode 100644
index 00000000..ab6ce2cf
--- /dev/null
+++ b/src/data/ApprovalReportData.ts
@@ -0,0 +1,72 @@
+import { AppSettings } from "../domain/common/entities/AppSettings";
+import { Code } from "../domain/common/entities/Base";
+
+const nhwaDataCapture1 = "NHWA _DATA Capture Module 1";
+const nhwaDataCapture2 = "NHWA _DATA Capture Module 2-4";
+const nhwaAdmin = "NHWA administrators";
+
+export const approvalReportAccess: D2ApprovalReportAccess = {
+    dataSets: {
+        "NHWA-M1-2023": {
+            complete: { userGroups: [nhwaAdmin], users: [] },
+            incomplete: { userGroups: [nhwaAdmin], users: [] },
+            monitoring: { userGroups: [nhwaAdmin], users: [] },
+            read: { userGroups: [nhwaAdmin, nhwaDataCapture1], users: [] },
+            revoke: { userGroups: [nhwaAdmin, nhwaDataCapture1], users: [] },
+            submit: { userGroups: [nhwaAdmin, nhwaDataCapture1], users: [] },
+            approve: { userGroups: [nhwaAdmin], users: [] },
+        },
+        "NHWA-M2-2023": {
+            complete: { userGroups: [nhwaAdmin], users: [] },
+            incomplete: { userGroups: [nhwaAdmin], users: [] },
+            monitoring: { userGroups: [nhwaAdmin], users: [] },
+            read: { userGroups: [nhwaAdmin, nhwaDataCapture2], users: [] },
+            revoke: { userGroups: [nhwaAdmin, nhwaDataCapture2], users: [] },
+            submit: { userGroups: [nhwaAdmin, nhwaDataCapture2], users: [] },
+            approve: { userGroups: [nhwaAdmin], users: [] },
+        },
+    },
+};
+
+export const approvalReportSettings: AppSettings = {
+    dataSets: {
+        "NHWA-M1-2023": {
+            dataSourceId: "hvvqvHV6jIq",
+            oldDataSourceId: "hvvqvHV6jIq",
+            approvalDataSetCode: "NHWA-M1-2023-APVD",
+            dataElements: {
+                approvalDate: "NHWA_APPROVAL_DATE_MODULE1-APVD",
+                submissionDate: "NHWA_SUBMISSION_DATE_MODULE1-APVD",
+            },
+        },
+        "NHWA-M2-2023": {
+            dataSourceId: "h8TOj5HtMM8",
+            oldDataSourceId: "h8TOj5HtMM8",
+            approvalDataSetCode: "NHWA-M2-2023-APVD",
+            dataElements: {
+                approvalDate: "NHWA_APPROVAL_DATE_MODULE2-APVD",
+                submissionDate: "NHWA_SUBMISSION_DATE_MODULE2-APVD",
+            },
+        },
+    },
+};
+
+type D2ApprovalReportAccess = Record<"dataSets", D2ApprovalAccessDataSets>;
+
+type D2ApprovalAccessDataSets = Record<
+    Code,
+    {
+        complete: AccessSettings;
+        incomplete: AccessSettings;
+        monitoring: AccessSettings;
+        read: AccessSettings;
+        revoke: AccessSettings;
+        submit: AccessSettings;
+        approve: AccessSettings;
+    }
+>;
+
+type AccessSettings = {
+    userGroups: Code[];
+    users: Code[];
+};
diff --git a/src/data/D2ApprovalReport.ts b/src/data/D2ApprovalReport.ts
new file mode 100644
index 00000000..a8d43f94
--- /dev/null
+++ b/src/data/D2ApprovalReport.ts
@@ -0,0 +1,7 @@
+import { approvalReportSettings } from "./ApprovalReportData";
+
+export class D2ApprovalReport {
+    get() {
+        return approvalReportSettings;
+    }
+}
diff --git a/src/data/DataSetStatusD2Repository.ts b/src/data/DataSetStatusD2Repository.ts
new file mode 100644
index 00000000..ae366cfe
--- /dev/null
+++ b/src/data/DataSetStatusD2Repository.ts
@@ -0,0 +1,56 @@
+import { Id } from "../domain/common/entities/Base";
+import { DataSetStatus } from "../domain/common/entities/DataSetStatus";
+import { DataSetStatusRepository } from "../domain/common/repositories/DataSetStatusRepository";
+import { D2Api } from "../types/d2-api";
+
+export class DataSetStatusD2Repository implements DataSetStatusRepository {
+    constructor(private api: D2Api) {}
+
+    async getBy(options: { dataSetId: string; orgUnitId: string; period: string }): Promise<DataSetStatus> {
+        const { dataSetId, orgUnitId, period } = options;
+        const completeResponse = await this.api
+            .request<D2CompleteDataSet>({
+                method: "get",
+                url: "/completeDataSetRegistrations",
+                params: { dataSet: dataSetId, orgUnit: orgUnitId, period: period },
+            })
+            .getData();
+
+        const isCompleted = completeResponse.completeDataSetRegistrations?.find(
+            registration =>
+                registration.completed &&
+                registration.dataSet === dataSetId &&
+                registration.organisationUnit === orgUnitId &&
+                registration.period === period
+        );
+
+        const submitResponse = await this.api
+            .request<D2SubmitDataSet>({
+                method: "get",
+                url: "/dataApprovals",
+                params: { ds: dataSetId, ou: orgUnitId, pe: period },
+            })
+            .getData();
+
+        return DataSetStatus.create({
+            isCompleted: isCompleted?.completed ?? false,
+            isSubmitted: submitResponse.state === "APPROVED_HERE" || submitResponse.state === "APPROVED_ELSEWHERE",
+        });
+    }
+}
+
+type D2CompleteDataSet = {
+    completeDataSetRegistrations?: Array<{
+        period: string;
+        dataSet: Id;
+        organisationUnit: Id;
+        attributeOptionCombo: Id;
+        date: string;
+        storedBy: string;
+        completed: boolean;
+    }>;
+};
+
+type D2SubmitDataSet = {
+    state: "APPROVED_HERE" | "APPROVED_ELSEWHERE";
+};
diff --git a/src/data/common/DataSetD2Repository.ts b/src/data/common/DataSetD2Repository.ts
index b3078316..f9df8ee1 100644
--- a/src/data/common/DataSetD2Repository.ts
+++ b/src/data/common/DataSetD2Repository.ts
@@ -1,5 +1,6 @@
 import { Id } from "../../domain/common/entities/Base";
 import { DataSet } from "../../domain/common/entities/DataSet";
+import { OrgUnit } from "../../domain/common/entities/OrgUnit";
 import { DataSetRepository } from "../../domain/common/repositories/DataSetRepository";
 import { D2Api } from "../../types/d2-api";
 
@@ -10,7 +11,7 @@ export class DataSetD2Repository implements DataSetRepository {
         return this.api.metadata
             .get({
                 dataSets: {
-                    fields: { id: true, name: true },
+                    fields: { id: true, code: true, name: true, organisationUnits: { id: true, name: true } },
                     filter: { identifiable: { eq: nameOrCode } },
                 },
             })
@@ -19,7 +20,21 @@ export class DataSetD2Repository implements DataSetRepository {
                 const dataSet = response.dataSets[0];
                 if (!dataSet) throw new Error(`DataSet not found: ${nameOrCode}`);
 
-                return { dataElements: [], id: dataSet.id, name: dataSet.name, organisationUnits: [] };
+                return {
+                    dataElements: [],
+                    code: dataSet.code,
+                    id: dataSet.id,
+                    name: dataSet.name,
+                    organisationUnits: dataSet.organisationUnits.map(
+                        (ou): OrgUnit => ({
+                            id: ou.id,
+                            name: ou.name,
+                            path: "",
+                            children: [],
+                            level: 0,
+                        })
+                    ),
+                };
             });
     }
 
@@ -37,6 +52,7 @@ export class DataSetD2Repository implements DataSetRepository {
                     return {
                         id: d2DataSet.id,
                         name: d2DataSet.name,
+                        code: d2DataSet.code,
                         dataElements: d2DataSet.dataSetElements.map(d2DataElement => {
                             return {
                                 id: d2DataElement.dataElement.id,
@@ -64,6 +80,7 @@ export class DataSetD2Repository implements DataSetRepository {
 const dataSetFields = {
     id: true,
     name: true,
+    code: true,
     dataSetElements: {
         dataElement: {
             id: true,
diff --git a/src/data/common/DataValuesD2Repository.ts b/src/data/common/DataValuesD2Repository.ts
index 831287aa..d58fc406 100644
--- a/src/data/common/DataValuesD2Repository.ts
+++ b/src/data/common/DataValuesD2Repository.ts
@@ -3,7 +3,7 @@ import { DataValue, DataValuesSelector, DataValueToPost } from "../../domain/com
 import { Stats } from "../../domain/common/entities/Stats";
 import { DataValuesRepository } from "../../domain/common/repositories/DataValuesRepository";
 import { D2Api } from "../../types/d2-api";
-import { promiseMap } from "../../utils/promises";
+import { getInChunks, promiseMap } from "../../utils/promises";
 
 const emptyImportResult = { deleted: 0, ignored: 0, imported: 0, updated: 0, errorMessages: [] };
 
@@ -21,7 +21,33 @@ export class DataValuesD2Repository implements DataValuesRepository {
         });
 
         const res = await res$.getData();
-        return res.dataValues;
+
+        const dataElementIds = res.dataValues.map(dataValue => dataValue.dataElement);
+
+        const dataElements = await getInChunks(dataElementIds, async deIds => {
+            const responseDes = await this.api.models.dataElements
+                .get({
+                    fields: { id: true, name: true },
+                    filter: { id: { in: deIds } },
+                    pageSize: 500,
+                })
+                .getData();
+
+            return _(responseDes.objects)
+                .map(d2DataElement => {
+                    return [d2DataElement.id, d2DataElement.name];
+                })
+                .value();
+        });
+
+        const dataElementsById = _(dataElements).fromPairs().value();
+
+        return res.dataValues.map(dataValue => {
+            return {
+                ...dataValue,
+                dataElementName: dataElementsById[dataValue.dataElement] || "",
+            };
+        });
     }
 
     async saveAll(dataValues: DataValueToPost[]): Promise<Stats> {
diff --git a/src/data/common/Dhis2ConfigRepository.ts b/src/data/common/Dhis2ConfigRepository.ts
index 4d1799ff..e9ad9061 100644
--- a/src/data/common/Dhis2ConfigRepository.ts
+++ b/src/data/common/Dhis2ConfigRepository.ts
@@ -1,11 +1,15 @@
 import _ from "lodash";
+import { AppSettings } from "../../domain/common/entities/AppSettings";
 import { keyById, NamedRef } from "../../domain/common/entities/Base";
 import { Config } from "../../domain/common/entities/Config";
 import { ReportType } from "../../domain/common/entities/ReportType";
-import { User } from "../../domain/common/entities/User";
+import { User, UserDataSetAction } from "../../domain/common/entities/User";
 import { ConfigRepository } from "../../domain/common/repositories/ConfigRepository";
 import { D2Api, Id } from "../../types/d2-api";
+import { Maybe } from "../../types/utils";
 import { getReportType } from "../../webapp/utils/reportType";
+import { approvalReportAccess } from "../ApprovalReportData";
+import { D2ApprovalReport } from "../D2ApprovalReport";
 import { malDataSetCodes } from "../reports/mal-data-approval/constants/MalDataApprovalConstants";
 
 export const SQL_VIEW_DATA_COMMENTS_NAME = "NHWA Data Comments";
@@ -109,53 +113,120 @@ const base: Record<ReportType, BaseConfigType> = {
 };
 
 export class Dhis2ConfigRepository implements ConfigRepository {
-    constructor(private api: D2Api, private type: ReportType) {}
+    private d2ApprovalReport: D2ApprovalReport;
+
+    constructor(private api: D2Api, private type: ReportType) {
+        this.d2ApprovalReport = new D2ApprovalReport();
+    }
 
     async get(): Promise<Config> {
-        const { dataSets, constants, sqlViews: existedSqlViews, dataApprovalWorkflows } = await this.getMetadata();
+        const appSettings = this.d2ApprovalReport.get();
+        const { dataSets, sqlViews: existedSqlViews, dataApprovalWorkflows } = await this.getMetadata(appSettings);
+        const currentUser = await this.getCurrentUser();
+        const userGroups = currentUser.userGroups.map(group => group.name);
+        const dataSetsToShow = _(dataSets)
+            .map(d2DataSet => {
+                const dataSetAccess = approvalReportAccess.dataSets[d2DataSet.code];
+                if (!dataSetAccess) return undefined;
+
+                if (currentUser.isAdmin) return d2DataSet;
+
+                return _(dataSetAccess.read.userGroups).intersection(userGroups).value().length > 0
+                    ? d2DataSet
+                    : undefined;
+            })
+            .compact()
+            .value();
+
         const filteredDataSets = getFilteredDataSets(dataSets);
 
         const sqlViews = existedSqlViews.reduce((acc, sqlView) => {
             return { ...acc, [sqlView.name]: sqlView };
         }, {});
 
-        const currentUser = await this.getCurrentUser();
         const pairedDataElements = getPairedMapping(filteredDataSets);
         const orgUnitList = getPairedOrgunitsMapping(filteredDataSets);
         const currentYear = new Date().getFullYear();
-        if (base[this.type].constantCode !== "") {
-            const constant = getNth(constants, 0, `Missing constant: ${base[this.type].constantCode}`);
-            const constantData = JSON.parse(constant.description || "{}") as Constant;
-            const { sections, sectionsByDataSet } = getSectionsInfo(constantData);
-
-            return {
-                dataSets: keyById(filteredDataSets),
-                currentUser,
-                sqlViews,
-                pairedDataElementsByDataSet: pairedDataElements,
-                orgUnits: orgUnitList,
-                sections: keyById(sections),
-                sectionsByDataSet,
-                years: _.range(currentYear - 10, currentYear + 1).map(n => n.toString()),
-                approvalWorkflow: dataApprovalWorkflows,
-            };
-        } else {
-            return {
-                dataSets: keyById(filteredDataSets),
-                currentUser,
-                sqlViews,
-                pairedDataElementsByDataSet: pairedDataElements,
-                orgUnits: orgUnitList,
-                sections: undefined,
-                sectionsByDataSet: undefined,
-                years: _.range(currentYear - 10, currentYear + 1).map(n => n.toString()),
-                approvalWorkflow: dataApprovalWorkflows,
-            };
-        }
+        return {
+            dataSets: keyById(dataSetsToShow),
+            currentUser: {
+                ...currentUser,
+                dataSets: _(dataSetsToShow)
+                    .map((dataSet): Maybe<D2UserDataSetAccess> => {
+                        const accessDataSet = approvalReportAccess.dataSets[dataSet.code];
+                        if (!accessDataSet) return undefined;
+                        return [
+                            dataSet.id,
+                            {
+                                complete:
+                                    _(accessDataSet.complete.userGroups).intersection(userGroups).value().length > 0,
+                                incomplete:
+                                    _(accessDataSet.incomplete.userGroups).intersection(userGroups).value().length > 0,
+                                monitoring:
+                                    _(accessDataSet.monitoring.userGroups).intersection(userGroups).value().length > 0,
+                                read: _(accessDataSet.read.userGroups).intersection(userGroups).value().length > 0,
+                                revoke: _(accessDataSet.revoke.userGroups).intersection(userGroups).value().length > 0,
+                                submit: _(accessDataSet.submit.userGroups).intersection(userGroups).value().length > 0,
+                                approve:
+                                    _(accessDataSet.approve.userGroups).intersection(userGroups).value().length > 0,
+                            },
+                        ];
+                    })
+                    .compact()
+                    .fromPairs()
+                    .value(),
+            },
+            sqlViews,
+            pairedDataElementsByDataSet: pairedDataElements,
+            orgUnits: orgUnitList,
+            sections: undefined,
+            sectionsByDataSet: undefined,
+            years: _.range(currentYear - 10, currentYear + 1).map(n => n.toString()),
+            approvalWorkflow: dataApprovalWorkflows,
+            appSettings: appSettings,
+        };
+    }
+
+    private async getDataSetsConfigured(): Promise<AppSettings["dataSets"]> {
+        const appSettings = this.d2ApprovalReport.get();
+
+        const dataSetsCodes = Object(appSettings.dataSets).keys();
+
+        if (dataSetsCodes.length === 0) throw new Error("No data sets configured");
+
+        const response = await this.api.models.dataSets
+            .get({
+                fields: {
+                    id: true,
+                    code: true,
+                    displayName: toName,
+                    dataSetElements: { dataElement: { id: true, name: true } },
+                    organisationUnits: { id: true },
+                },
+                filter: { code: { in: dataSetsCodes } },
+            })
+            .getData();
+
+        return _(response.objects)
+            .map(d2DataSet => {
+                const currentDataSet = appSettings.dataSets[d2DataSet.code];
+                if (!currentDataSet) {
+                    console.warn(`No dataSet config. found with code: ${d2DataSet.code}`);
+                    return undefined;
+                }
+
+                return [d2DataSet.code, currentDataSet];
+            })
+            .compact()
+            .fromPairs()
+            .value();
     }
 
-    getMetadata() {
-        const { dataSets, constantCode, sqlViewNames, approvalWorkflows } = base[this.type];
+    getMetadata(appSettings: AppSettings) {
+        const dataSetCodes = Object.keys(appSettings.dataSets);
+        if (dataSetCodes.length === 0) throw new Error("No data sets configured");
+
+        const { constantCode, sqlViewNames, approvalWorkflows } = base.mal;
 
         const metadata$ = this.api.metadata.get({
             dataSets: {
@@ -168,10 +239,7 @@ export class Dhis2ConfigRepository implements ConfigRepository {
                     },
                     organisationUnits: { id: true },
                 },
-                filter: {
-                    name: dataSets.namePrefix ? { $ilike: dataSets.namePrefix } : undefined,
-                    code: dataSets.codes ? { in: dataSets.codes } : undefined,
-                },
+                filter: { code: { in: dataSetCodes } },
             },
             constants: {
                 fields: { description: true },
@@ -204,7 +272,7 @@ export class Dhis2ConfigRepository implements ConfigRepository {
                     },
                     userCredentials: {
                         username: true,
-                        userRoles: { id: true, name: true },
+                        userRoles: { id: true, name: true, authorities: true },
                     },
                     userGroups: { id: true, name: true },
                 },
@@ -217,6 +285,7 @@ export class Dhis2ConfigRepository implements ConfigRepository {
             orgUnits: d2User.dataViewOrganisationUnits.map(ou => ({ ...ou, children: [] })),
             userGroups: d2User.userGroups,
             ...d2User.userCredentials,
+            isAdmin: d2User.userCredentials.userRoles.some(role => role.authorities.includes("ALL")),
         };
     }
 }
@@ -227,11 +296,6 @@ interface DataSet {
     organisationUnits: Array<{ id: Id }>;
 }
 
-type Constant = Partial<{
-    sections?: Record<Id, string>;
-    sectionNames?: Record<string, string>;
-}>;
-
 function getNameOfDataElementWithValue(name: string): string {
     const s = "NHWA_" + name.replace(/NHWA_Comment of /, "");
     return s.replace(" - ", " for ");
@@ -289,41 +353,6 @@ function getMappingForDataSet(dataSet: DataSet, dataElementsByName: Record<strin
         .value();
 }
 
-function getNth<T>(objs: T[], n: number, msg: string): T {
-    const obj = objs[n];
-    if (!obj) throw new Error(msg);
-    return obj;
-}
-
-function getSectionsInfo(constantData: Constant) {
-    const sectionNames = constantData.sectionNames || {};
-    const jsonSections = constantData.sections || {};
-
-    const sections = _(jsonSections)
-        .values()
-        .uniq()
-        .sortBy()
-        .map(sectionId => ({ id: sectionId, name: sectionNames[sectionId] || "" }))
-        .value();
-
-    const sectionsByDataSet = _(jsonSections)
-        .toPairs()
-        .map(([entryId, sectionId]) => {
-            const [dataSetId] = entryId.split(".");
-            return { dataSetId, sectionId };
-        })
-        .groupBy(obj => obj.dataSetId)
-        .mapValues(objs =>
-            _(objs)
-                .map(obj => ({ id: obj.sectionId, name: sectionNames[obj.sectionId] || "" }))
-                .uniqBy(obj => obj.id)
-                .value()
-        )
-        .value();
-
-    return { sections, sectionsByDataSet };
-}
-
 function getFilteredDataSets<DataSet extends NamedRef>(dataSets: DataSet[]): DataSet[] {
     const type = getReportType();
     const { namePrefix, nameExcluded } = base[type].dataSets;
@@ -333,3 +362,5 @@ function getFilteredDataSets<DataSet extends NamedRef>(dataSets: DataSet[]): Dat
 }
 
 const toName = { $fn: { name: "rename", to: "name" } } as const;
+
+type D2UserDataSetAccess = [string, UserDataSetAction];
diff --git a/src/data/common/clients/storage/Namespaces.ts b/src/data/common/clients/storage/Namespaces.ts
index 55d79149..d8cccbb8 100644
--- a/src/data/common/clients/storage/Namespaces.ts
+++ b/src/data/common/clients/storage/Namespaces.ts
@@ -7,9 +7,9 @@ export type Namespace = typeof Namespaces[keyof typeof Namespaces];
 
 export const Namespaces = {
     NHWA_APPROVAL_STATUS_USER_COLUMNS: "nhwa-approval-status-user-columns",
-    MAL_APPROVAL_STATUS_USER_COLUMNS: "mal-approval-status-user-columns",
+    MAL_APPROVAL_STATUS_USER_COLUMNS: "nhwa-data-approval-status-user-columns",
     MAL_DIFF_STATUS_USER_COLUMNS: "mal-diff-status-user-columns",
-    MAL_DIFF_NAMES_SORT_ORDER: "mal-diff-names-sort-order",
+    MAL_DIFF_NAMES_SORT_ORDER: "nhwa-data-approval-diff-names-sort-order",
     MONITORING: "monitoring",
     MAL_SUBSCRIPTION_STATUS_USER_COLUMNS: "mal-subscription-status-user-columns",
     MAL_DASHBOARD_SUBSCRIPTION_USER_COLUMNS: "mal-dashboard-subscription-user-columns",
diff --git a/src/data/common/clients/storage/Namespaces.ts.orig b/src/data/common/clients/storage/Namespaces.ts.orig
deleted file mode 100644
index a5eb3384..00000000
--- a/src/data/common/clients/storage/Namespaces.ts.orig
+++ /dev/null
@@ -1,32 +0,0 @@
-export const d2ReportsDataStoreNamespace = "d2-reports";
-export const glassDataStoreNamespace = "glass";
-export const constantPrefix = "D2 Report Storage";
-
-export type Namespace = typeof Namespaces[keyof typeof Namespaces];
-
-export const Namespaces = {
-    NHWA_APPROVAL_STATUS_USER_COLUMNS: "nhwa-approval-status-user-columns",
-    MAL_APPROVAL_STATUS_USER_COLUMNS: "mal-approval-status-user-columns",
-    MAL_DIFF_STATUS_USER_COLUMNS: "mal-diff-status-user-columns",
-    MAL_DIFF_NAMES_SORT_ORDER: "mal-diff-names-sort-order",
-    MONITORING: "monitoring",
-    MAL_SUBSCRIPTION_STATUS_USER_COLUMNS: "mal-subscription-status-user-columns",
-    MAL_SUBSCRIPTION_STATUS: "mal-subscription-status",
-    DATA_SUBMISSSIONS: "data-submissions",
-    DATA_SUBMISSSIONS_USER_COLUMNS: "data-submissions-user-columns",
-    DATA_SUBMISSSIONS_MODULES: "modules",
-    DATA_SUBMISSSIONS_UPLOADS: "uploads",
-};
-
-export const NamespaceProperties: Record<Namespace, string[]> = {
-    [Namespaces.NHWA_APPROVAL_STATUS_USER_COLUMNS]: [],
-    [Namespaces.MAL_APPROVAL_STATUS_USER_COLUMNS]: [],
-    [Namespaces.MAL_DIFF_STATUS_USER_COLUMNS]: [],
-    [Namespaces.MAL_DIFF_NAMES_SORT_ORDER]: [],
-    [Namespaces.MONITORING]: [],
-    [Namespaces.MAL_SUBSCRIPTION_STATUS]: [],
-    [Namespaces.DATA_SUBMISSSIONS]: [],
-    [Namespaces.DATA_SUBMISSSIONS_USER_COLUMNS]: [],
-    [Namespaces.DATA_SUBMISSSIONS_MODULES]: [],
-    [Namespaces.DATA_SUBMISSSIONS_UPLOADS]: [],
-};
diff --git a/src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts b/src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts
index c486f495..8f7d34f4 100644
--- a/src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts
+++ b/src/data/reports/mal-data-approval/MalDataApprovalDefaultRepository.ts
@@ -1,6 +1,12 @@
 import _ from "lodash";
-import { D2Api, Id, PaginatedObjects } from "../../../types/d2-api";
-import { promiseMap } from "../../../utils/promises";
+import {
+    D2Api,
+    DataValueSetsPostResponse,
+    Id,
+    PaginatedObjects,
+    DataValueSetsPostRequest,
+} from "../../../types/d2-api";
+import { promiseMap, promiseMapConcurrent } from "../../../utils/promises";
 import { DataStoreStorageClient } from "../../common/clients/storage/DataStoreStorageClient";
 import { StorageClient } from "../../common/clients/storage/StorageClient";
 import { CsvData } from "../../common/CsvDataSource";
@@ -9,12 +15,7 @@ import { Dhis2SqlViews, SqlViewGetData } from "../../common/Dhis2SqlViews";
 import { Instance } from "../../common/entities/Instance";
 import { downloadFile } from "../../common/utils/download-file";
 import { getSqlViewId } from "../../../domain/common/entities/Config";
-import {
-    SQL_VIEW_DATA_DUPLICATION_NAME,
-    SQL_VIEW_MAL_DIFF_NAME,
-    SQL_VIEW_MAL_METADATA_NAME,
-    SQL_VIEW_OLD_DATA_DUPLICATION_NAME,
-} from "../../common/Dhis2ConfigRepository";
+import { SQL_VIEW_MAL_METADATA_NAME } from "../../common/Dhis2ConfigRepository";
 import {
     MalDataApprovalItem,
     MalDataApprovalItemIdentifier,
@@ -23,12 +24,15 @@ import {
     MalDataApprovalOptions,
     MalDataApprovalRepository,
 } from "../../../domain/reports/mal-data-approval/repositories/MalDataApprovalRepository";
-import { DataDiffItem, DataDiffItemIdentifier } from "../../../domain/reports/mal-data-approval/entities/DataDiffItem";
+import { DataDiffItemIdentifier } from "../../../domain/reports/mal-data-approval/entities/DataDiffItem";
 import { Namespaces } from "../../common/clients/storage/Namespaces";
 import { emptyPage, paginate } from "../../../domain/common/entities/PaginatedObjects";
-import { malApvdDataSets, malariaDataSets, MalDataSet } from "./constants/MalDataApprovalConstants";
+import { MalDataSet } from "./constants/MalDataApprovalConstants";
 import { getMetadataByIdentifiableToken } from "../../common/utils/getMetadataByIdentifiableToken";
-import { isValueInUnionType } from "../../../types/utils";
+import { Maybe } from "../../../types/utils";
+import { DataValueStats } from "../../../domain/common/entities/DataValueStats";
+import { approvalReportSettings } from "../../ApprovalReportData";
+import { DATA_ELEMENT_SUFFIX } from "../../../domain/common/entities/AppSettings";
 
 interface VariableHeaders {
     dataSets: string;
@@ -44,12 +48,6 @@ interface Variables {
     orderByDirection: "asc" | "desc";
 }
 
-interface VariablesDiff {
-    dataSets: string;
-    orgUnits: string;
-    periods: string;
-}
-
 type SqlFieldHeaders = "datasetuid" | "dataset" | "orgunituid" | "orgunit" | "orgunitcode";
 
 type CompleteDataSetRegistrationsType = {
@@ -94,19 +92,6 @@ type DataElementMapping = {
     name?: string;
 };
 
-type SqlFieldDiff =
-    | "datasetuid"
-    | "dataset"
-    | "orgunituid"
-    | "orgunit"
-    | "period"
-    | "value"
-    | "apvdvalue"
-    | "dataelement"
-    | "apvddataelement"
-    | "comment"
-    | "apvdcomment";
-
 type SqlField =
     | "datasetuid"
     | "dataset"
@@ -154,62 +139,32 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
         this.storageClient = new DataStoreStorageClient("user", instance);
     }
 
-    async getDiff(options: MalDataApprovalOptions): Promise<PaginatedObjects<DataDiffItem>> {
-        const { dataSetId, orgUnitIds, periods } = options;
-        if (!dataSetId) return emptyPage;
-
-        const sqlViews = new Dhis2SqlViews(this.api);
-        const pagingToDownload = { page: 1, pageSize: 10000 };
-        const sqlVariables = {
-            orgUnits: sqlViewJoinIds(orgUnitIds),
-            periods: sqlViewJoinIds(periods),
-            dataSets: dataSetId,
-        };
-        const rows = await this.getSqlViewRows<VariablesDiff, SqlFieldDiff>(
-            sqlViews,
-            SQL_VIEW_MAL_DIFF_NAME,
-            sqlVariables,
-            pagingToDownload
-        );
-
-        const items: Array<DataDiffItem> = rows.map(
-            (item): DataDiffItem => ({
-                dataSetUid: item.datasetuid,
-                orgUnitUid: item.orgunituid,
-                period: item.period,
-                value: item.value,
-                apvdValue: item.apvdvalue,
-                dataElement: item.dataelement,
-                apvdDataElement: item.apvddataelement,
-                comment: item.comment,
-                apvdComment: item.apvdcomment,
-            })
-        );
-
-        const dataElementOrderArray = await this.getSortOrder();
-
-        if (!_.isEmpty(dataElementOrderArray)) {
-            const sortedItems = items.sort((a, b) => {
-                if (a.dataElement && b.dataElement) {
-                    return dataElementOrderArray.indexOf(a.dataElement) - dataElementOrderArray.indexOf(b.dataElement);
-                } else {
-                    return 0;
-                }
-            });
-            return paginate(sortedItems, options.paging);
-        } else {
-            return paginate(items, options.paging);
-        }
-    }
-
     async get(options: MalDataApprovalOptions): Promise<PaginatedObjects<MalDataApprovalItem>> {
-        const { approvalStatus, completionStatus, config, dataSetId, orgUnitIds, periods, sorting, useOldPeriods } =
-            options;
+        const {
+            isApproved,
+            approvalStatus,
+            completionStatus,
+            config,
+            dataSetId,
+            orgUnitIds,
+            periods,
+            sorting,
+            useOldPeriods,
+            modificationCount,
+        } = options;
         if (!dataSetId) return emptyPage;
+        const dataSetResponse = await this.api.models.dataSets
+            .get({ fields: { id: true, code: true }, filter: { id: { eq: dataSetId } } })
+            .getData();
+
+        const dataSet = dataSetResponse.objects[0];
+        if (!dataSet) throw new Error(`Data set not found for ID: ${dataSetId}`);
 
         const sqlViews = new Dhis2SqlViews(this.api);
         const pagingToDownload = { page: 1, pageSize: 10000 };
-        const sqlViewId = !useOldPeriods ? SQL_VIEW_DATA_DUPLICATION_NAME : SQL_VIEW_OLD_DATA_DUPLICATION_NAME;
+        const dataSetSettings = config.appSettings.dataSets[dataSet.code];
+        if (!dataSetSettings) throw new Error(`Data set settings not found for ID: ${dataSetId}`);
+
         const sqlVariables = {
             orgUnitRoot: sqlViewJoinIds(config.currentUser.orgUnits.map(({ id }) => id)),
             orgUnits: sqlViewJoinIds(orgUnitIds),
@@ -224,19 +179,31 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
         const headerRows = await this.getSqlViewHeaders<SqlFieldHeaders>(sqlViews, options, pagingToDownload);
         const rows = await this.getSqlViewRows<Variables, SqlField>(
             sqlViews,
-            getSqlViewId(config, sqlViewId),
+            useOldPeriods ? dataSetSettings.oldDataSourceId : dataSetSettings.dataSourceId,
             sqlVariables,
             pagingToDownload
         );
 
         const { pager, objects } = mergeHeadersAndData(options, headerRows, rows);
-        const objectsInPage = await promiseMap(objects, async item => {
+
+        const objectsWithApprovalFilter =
+            isApproved === undefined
+                ? objects
+                : isApproved
+                ? objects.filter(item => Boolean(item.lastDateOfApproval))
+                : objects.filter(item => !item.lastDateOfApproval);
+
+        const modificationCountObjects =
+            modificationCount === undefined
+                ? objectsWithApprovalFilter
+                : modificationCount === "0"
+                ? objectsWithApprovalFilter.filter(item => !item.modificationCount)
+                : objectsWithApprovalFilter.filter(item => Boolean(item.modificationCount));
+
+        const objectsInPage = await promiseMap(modificationCountObjects, async item => {
             const { approved } = await this.getDataApprovalStatus(item);
 
-            return {
-                ...item,
-                approved: approved,
-            };
+            return { ...item, approved: approved };
         });
 
         return { pager: pager, objects: objectsInPage };
@@ -328,20 +295,32 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
 
     async approve(dataSets: MalDataApprovalItemIdentifier[]): Promise<boolean> {
         try {
-            const malSubmissionDateDataElement = await getMetadataByIdentifiableToken({
+            const originalDataSetId = dataSets[0]?.dataSet;
+            if (!originalDataSetId) throw Error("No data set ID found");
+
+            const { dataSetId } = await this.getApprovalDataSetId([{ dataSet: originalDataSetId }]);
+            const settings = await this.getSettingByDataSet([dataSetId]);
+            const dataSetSettings = settings.find(setting => setting.dataSetId === dataSetId);
+            if (!dataSetSettings) throw new Error(`Data set settings not found: ${dataSetId}`);
+
+            const dataElement = await getMetadataByIdentifiableToken({
                 api: this.api,
                 metadataType: "dataElements",
-                token: dataElementCodes.MAL_SUBMISSION_DATE,
+                token: dataSetSettings.dataElements.submissionDate,
             });
 
-            const dataValues = dataSets.map(ds => ({
-                dataSet: ds.dataSet,
-                period: ds.period,
-                orgUnit: ds.orgUnit,
-                dataElement: malSubmissionDateDataElement.id,
-                categoryOptionCombo: DEFAULT_COC,
-                value: getISODate(),
-            }));
+            const currentDate = getISODate();
+
+            const dataValues = dataSets.map(ds => {
+                return {
+                    dataSet: ds.dataSet,
+                    period: ds.period,
+                    orgUnit: ds.orgUnit,
+                    dataElement: dataElement.id,
+                    categoryOptionCombo: DEFAULT_COC,
+                    value: currentDate,
+                };
+            });
 
             const dateResponse = await this.api.post<any>("/dataValueSets.json", {}, { dataValues }).getData();
             if (dateResponse.response.status !== "SUCCESS") throw new Error("Error when posting Submission date");
@@ -390,7 +369,7 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
         }
     }
 
-    async getApprovalDataSetId(dataApprovalItems: { dataSet: Id }[]): Promise<string> {
+    async getApprovalDataSetId(dataApprovalItems: { dataSet: Id }[]) {
         const dataSetId = dataApprovalItems[0]?.dataSet;
         if (!dataSetId) throw new Error("Data set not found");
 
@@ -400,9 +379,10 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
             token: dataSetId,
         });
 
-        const approvedDataSetCode = isValueInUnionType(dataSetName, malariaDataSets)
-            ? malApvdDataSets[dataSetName]
-            : undefined;
+        const settings = await this.getSettingByDataSet([dataSetId]);
+        const dataSetSettings = settings.find(setting => setting.dataSetId === dataSetId);
+
+        const approvedDataSetCode = dataSetSettings?.approvalDataSetCode;
         if (!approvedDataSetCode) throw new Error(`Approved data set code not found for data set: ${dataSetName}`);
 
         const { id: apvdDataSetId } = await getMetadataByIdentifiableToken({
@@ -411,7 +391,7 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
             token: approvedDataSetCode,
         });
 
-        return process.env.REACT_APP_APPROVE_DATASET_ID ?? apvdDataSetId;
+        return { approvalDataSetId: apvdDataSetId, dataSetId };
     }
 
     async duplicateDataSets(
@@ -419,21 +399,19 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
         dataElementsWithValues: DataDiffItemIdentifier[]
     ): Promise<boolean> {
         try {
-            const approvalDataSetId = await this.getApprovalDataSetId(dataSets);
+            const { approvalDataSetId, dataSetId } = await this.getApprovalDataSetId(dataSets);
 
             const dataValueSets: DataSetsValueType[] = await this.getDataValueSets(dataSets);
 
             const uniqueDataSets = _.uniqBy(dataSets, "dataSet");
-            const DSDataElements: { dataSetElements: DataSetElementsType[] }[] = await this.getDSDataElements(
-                uniqueDataSets
-            );
+            const DSDataElements = await this.getDSDataElements(uniqueDataSets);
 
             const ADSDataElements: DataElementsType[] = await this.getADSDataElements(approvalDataSetId);
 
             const dataElementsMatchedArray = DSDataElements.flatMap(DSDataElement => {
                 return DSDataElement.dataSetElements.map(element => {
                     const dataElement = element.dataElement;
-                    const othername = dataElement.name + "-APVD";
+                    const othername = dataElement.name + DATA_ELEMENT_SUFFIX;
                     const ADSDataElement = ADSDataElements.find(DataElement => String(DataElement.name) === othername);
                     return {
                         origId: dataElement.id,
@@ -444,10 +422,9 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
 
             const dataValues = this.makeDataValuesArray(approvalDataSetId, dataValueSets, dataElementsMatchedArray);
 
-            await this.addTimestampsToDataValuesArray(approvalDataSetId, dataSets, dataValues);
+            await this.addTimestampsToDataValuesArray(approvalDataSetId, dataSets, dataValues, dataSetId);
 
             await this.deleteEmptyDataValues(approvalDataSetId, ADSDataElements, dataElementsWithValues);
-
             return this.chunkedDataValuePost(dataValues, 3000);
         } catch (error: any) {
             console.debug(error);
@@ -457,9 +434,9 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
 
     async duplicateDataValues(dataValues: DataDiffItemIdentifier[]): Promise<boolean> {
         try {
-            const approvalDataSetId = await this.getApprovalDataSetId(dataValues);
+            const { approvalDataSetId, dataSetId } = await this.getApprovalDataSetId(dataValues);
             const uniqueDataSets = _.uniqBy(dataValues, "dataSet");
-            const uniqueDataElementsNames = _.uniq(_.map(dataValues, "dataElement"));
+            const uniqueDataElementsNames = _.uniq(_.map(dataValues, x => x.dataElement));
 
             const DSDataElements = await this.getDSDataElements(uniqueDataSets);
 
@@ -471,7 +448,7 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
                 return DSDataElement.dataSetElements.flatMap(element => {
                     const dataElement = element.dataElement;
                     if (uniqueDataElementsNames.includes(dataElement.name)) {
-                        const othername = dataElement.name + "-APVD";
+                        const othername = dataElement.name + DATA_ELEMENT_SUFFIX;
                         const ADSDataElement = ADSDataElements.find(DataElement => DataElement.name === othername);
                         return {
                             origId: dataElement.id,
@@ -486,7 +463,7 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
 
             const apvdDataValues = this.makeDataValuesArray(approvalDataSetId, dataValueSets, dataElementsMatchedArray);
 
-            await this.addTimestampsToDataValuesArray(approvalDataSetId, dataValues, apvdDataValues);
+            await this.addTimestampsToDataValuesArray(approvalDataSetId, dataValues, apvdDataValues, dataSetId);
 
             await this.deleteEmptyDataValues(approvalDataSetId, ADSDataElements, dataValues);
 
@@ -497,43 +474,229 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
         }
     }
 
+    // TODO: All this logic must be in the domain. ApproveMalDataValuesUseCase.ts
+    async replicateDataValuesInApvdDataSet(originalDataValues: DataDiffItemIdentifier[]): Promise<DataValueStats[]> {
+        const { approvalDataSetId, dataSetId } = await this.getApprovalDataSetId(originalDataValues);
+        const settings = await this.getSettingByDataSet([dataSetId]);
+        const dataSetSettings = settings.find(setting => setting.dataSetId === dataSetId);
+        if (!dataSetSettings) throw new Error(`Data set settings not found: ${dataSetId}`);
+
+        const approvalDataElements = await this.getADSDataElements(approvalDataSetId);
+        const approvalDeByName = _.keyBy(approvalDataElements, dataElement => dataElement.name.toLowerCase());
+
+        const approvalDateDataElement = await getMetadataByIdentifiableToken({
+            api: this.api,
+            metadataType: "dataElements",
+            token: dataSetSettings.dataElements.approvalDate,
+        });
+
+        const approvalDataValues = _(originalDataValues)
+            .map((dataValue): Maybe<D2DataValue> => {
+                const dataElementNameLowerCase = dataValue.dataElementBasicName?.toLowerCase();
+                const dataElementKey = `${dataElementNameLowerCase}${DATA_ELEMENT_SUFFIX}`.toLowerCase();
+                const apvdDataElement = approvalDeByName[dataElementKey];
+
+                if (!apvdDataElement) {
+                    console.warn(
+                        `Data element ${dataValue.dataElement} not found in approval data elements. Ignoring record.`
+                    );
+                    return undefined;
+                }
+
+                // Empty dataValues can't be saved, so we skip them.
+                // The method deleteEmptyDataValues will handle the deletion of these records
+                if (!dataValue.value) return undefined;
+
+                return {
+                    dataElement: apvdDataElement.id,
+                    value: dataValue.value,
+                    orgUnit: dataValue.orgUnit,
+                    period: dataValue.period,
+                    attributeOptionCombo: dataValue.attributeOptionCombo,
+                    categoryOptionCombo: dataValue.categoryOptionCombo,
+                    comment: dataValue.comment,
+                };
+            })
+            .compact()
+            .value();
+
+        const timeStampDataValues = this.generateTimeStampDataValue(
+            approvalDataValues,
+            approvalDataSetId,
+            approvalDateDataElement.id
+        );
+
+        const deleteStats = await this.deleteEmptyDataValues(
+            approvalDataSetId,
+            approvalDataElements,
+            originalDataValues
+        );
+
+        const saveStats = await this.saveDataValues(
+            approvalDataValues.concat(timeStampDataValues),
+            approvalDataSetId,
+            "CREATE_AND_UPDATE"
+        );
+        return [...deleteStats, ...saveStats];
+    }
+
+    private async saveDataValues(
+        dataValues: D2DataValue[],
+        dataSetId: Maybe<Id>,
+        strategy: "DELETE" | "CREATE_AND_UPDATE"
+    ): Promise<DataValueStats[]> {
+        const dvByPeriodAndOrgUnit = _(dataValues)
+            .groupBy(item => `${item.orgUnit}-${item.period}`)
+            .value();
+
+        const dataValuesByPeriodOrgUnit = _(dvByPeriodAndOrgUnit)
+            .map((dvOrgUnitPeriod, key) => {
+                const [orgUnit, period] = key.split("-");
+                if (!orgUnit || !period) {
+                    throw new Error(`[saveDataValues]: Invalid orgUnit or period in key: ${key}`);
+                }
+                return { period: period, orgUnit: orgUnit, dataValues: dvOrgUnitPeriod };
+            })
+            .value();
+
+        const dvStats = await promiseMapConcurrent(dataValuesByPeriodOrgUnit, async dataValueToSave => {
+            console.debug(
+                `${strategy}: ${dataValueToSave.dataValues.length} dataValues: [orgunit-period] ${dataValueToSave.orgUnit}-${dataValueToSave.period}`
+            );
+
+            try {
+                const response = await this.api.dataValues
+                    .postSet(
+                        { dryRun: false, importStrategy: strategy },
+                        { dataSet: dataSetId, dataValues: dataValueToSave.dataValues }
+                    )
+                    .getData();
+
+                return this.getDataValueStats({
+                    dataSetId: dataSetId,
+                    response: response,
+                    period: dataValueToSave.period,
+                    orgUnitId: dataValueToSave.orgUnit,
+                    strategy: strategy === "DELETE" ? "DELETE" : "SAVE",
+                });
+            } catch (error) {
+                const errorResponse = error as D2DataValueResponse;
+                return this.getDataValueStats({
+                    dataSetId: dataSetId,
+                    response: errorResponse.response?.data?.response,
+                    period: dataValueToSave.period,
+                    orgUnitId: dataValueToSave.orgUnit,
+                    strategy: strategy === "DELETE" ? "DELETE" : "SAVE",
+                });
+            }
+        });
+
+        return _(dvStats).compact().value();
+    }
+
+    private getDataValueStats(options: {
+        dataSetId: Maybe<Id>;
+        response: Maybe<DataValueSetsPostResponse>;
+        period: string;
+        orgUnitId: Id;
+        strategy: DataValueStats["strategy"];
+    }): Maybe<DataValueStats> {
+        const { dataSetId, response, period, orgUnitId, strategy } = options;
+        if (!response) {
+            console.warn(`Response is undefined or null: ${orgUnitId}-${period}`);
+            return undefined;
+        }
+
+        return new DataValueStats({
+            dataSetId: dataSetId ?? "",
+            deleted: response.importCount.deleted,
+            updated: response.importCount.updated,
+            errorMessages: _(response.conflicts)
+                .map(conflict => {
+                    return { message: conflict.value };
+                })
+                .compact()
+                .value(),
+            ignored: response.importCount.ignored,
+            imported: response.importCount.imported,
+            period: period,
+            orgUnitId: orgUnitId,
+            strategy: strategy,
+        });
+    }
+
+    private generateTimeStampDataValue(
+        dataValues: D2DataValue[],
+        approvalDataSetId: Id,
+        dataElementId: Id
+    ): D2DataValue[] {
+        const dataValuesByOrgUnitAndPeriod = _(dataValues)
+            .groupBy(item => `${item.orgUnit}-${item.period}`)
+            .value();
+
+        return Object.keys(dataValuesByOrgUnitAndPeriod).flatMap(key => {
+            const [orgUnit, period] = key.split("-");
+            if (!orgUnit || !period) {
+                console.warn(`[generateTimeStampDataValue]: Invalid orgUnit or period in key: ${key}`);
+                return [];
+            }
+
+            return {
+                dataSet: approvalDataSetId,
+                period: period,
+                orgUnit: orgUnit,
+                dataElement: dataElementId,
+                categoryOptionCombo: DEFAULT_COC,
+                attributeOptionCombo: DEFAULT_COC,
+                value: getISODate(),
+            };
+        });
+    }
+
+    private async getApprovalDataSetIdentifier(): Promise<Id> {
+        const { id } = await getMetadataByIdentifiableToken({
+            api: this.api,
+            metadataType: "dataSets",
+            token: MAL_WMR_FORM_APVD_NAME,
+        });
+
+        return process.env.REACT_APP_APPROVE_DATASET_ID ?? id;
+    }
+
     private async deleteEmptyDataValues(
         approvalDataSetId: string,
         approvedDataElements: DataElementsType[],
         dataValues: DataDiffItemIdentifier[]
-    ): Promise<void> {
+    ): Promise<DataValueStats[]> {
         const emptyDataValues = _(dataValues)
             .filter(dataValue => !dataValue.value && dataValue.apvdValue !== undefined)
-            .map(dataValue => {
+            .map((dataValue): Maybe<D2DataValue> => {
                 const apvdDataElementId = approvedDataElements.find(
-                    dataElement => `${dataValue.dataElement}-APVD` === dataElement.name
+                    dataElement => `${dataValue.dataElementBasicName}${DATA_ELEMENT_SUFFIX}` === dataElement.name
                 )?.id;
 
                 if (!apvdDataElementId) {
-                    console.warn(`Data element ${dataValue.dataElement} not found`);
+                    console.warn(`deleteEmptyDataValues: Data element ${dataValue.dataElement} not found`);
                     return undefined;
                 }
 
                 return {
-                    coc: DEFAULT_COC,
                     dataElement: apvdDataElementId,
+                    value: dataValue.apvdValue,
                     orgUnit: dataValue.orgUnit,
                     period: dataValue.period,
-                    value: dataValue.value,
+                    attributeOptionCombo: dataValue.attributeOptionCombo,
+                    categoryOptionCombo: dataValue.categoryOptionCombo,
+                    comment: dataValue.comment,
                 };
             })
             .compact()
             .value();
 
-        if (!_.isEmpty(emptyDataValues)) {
-            return this.api.dataValues
-                .postSet({ importStrategy: "DELETE" }, { dataSet: approvalDataSetId, dataValues: emptyDataValues })
-                .getData()
-                .then(dataValueSetsPostResponse => {
-                    if (dataValueSetsPostResponse.status !== "SUCCESS") {
-                        throw new Error("Error when deleting empty data values");
-                    }
-                });
+        if (emptyDataValues.length > 0) {
+            return this.saveDataValues(emptyDataValues, approvalDataSetId, "DELETE");
+        } else {
+            return [];
         }
     }
 
@@ -574,12 +737,16 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
     private async addTimestampsToDataValuesArray(
         approvalDataSetId: string,
         actionItems: MalDataApprovalItemIdentifier[] | DataDiffItemIdentifier[],
-        dataValues: DataValueType[]
+        dataValues: DataValueType[],
+        originalDataSetId: string
     ) {
+        const settings = await this.getSettingByDataSet([originalDataSetId]);
+        const dataSetSettings = settings.find(setting => setting.dataSetId === originalDataSetId);
+        if (!dataSetSettings) throw new Error(`Data set settings not found: ${originalDataSetId}`);
         const malApprovalDateDataElement = await getMetadataByIdentifiableToken({
             api: this.api,
             metadataType: "dataElements",
-            token: dataElementCodes.MAL_APPROVAL_DATE_APVD,
+            token: dataSetSettings.dataElements.approvalDate,
         });
 
         actionItems.forEach(actionItem => {
@@ -625,26 +792,37 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
         });
     }
 
-    private async chunkedDataValuePost(apvdDataValues: DataValueType[], chunkSize: number) {
+    private async chunkedDataValuePost(apvdDataValues: DataValueType[], chunkSize: number): Promise<boolean> {
         if (apvdDataValues.length > chunkSize) {
-            const copyResponse = [];
+            const copyResponse: DataValueSetsPostResponse[] = [];
             for (let i = 0; i < apvdDataValues.length; i += chunkSize) {
                 const chunk = apvdDataValues.slice(i, i + chunkSize);
-                const response = await this.api
-                    .post<any>("/dataValueSets.json", {}, { dataValues: _.reject(chunk, _.isEmpty) })
-                    .getData();
 
-                copyResponse.push(response);
+                return await this.api.dataValues
+                    .postSet({}, { dataValues: _.reject(chunk, _.isEmpty) })
+                    .getData()
+                    .catch(error => console.debug(error))
+                    .then(response => {
+                        if (response) {
+                            console.debug(response);
+                            copyResponse.push(response);
+                        }
+                        return false;
+                    });
             }
             return _.every(copyResponse, item => item.status === "SUCCESS");
         } else {
-            const copyResponse = await this.api
-                .post<any>("/dataValueSets.json", {}, { dataValues: _.reject(apvdDataValues, _.isEmpty) })
-                .getData();
-
-            return copyResponse.response
-                ? copyResponse.response.status === "SUCCESS"
-                : copyResponse.status === "SUCCESS";
+            return await this.api.dataValues
+                .postSet({}, { dataValues: _.reject(apvdDataValues, _.isEmpty) })
+                .getData()
+                .catch(error => console.debug(error))
+                .then(copyResponse => {
+                    if (copyResponse) {
+                        console.debug(copyResponse);
+                        return copyResponse.status === "SUCCESS";
+                    }
+                    return false;
+                });
         }
     }
 
@@ -660,6 +838,9 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
                 value: dataValues[0]?.value ?? "",
                 apvdValue: dataValues[0]?.apvdValue ?? "",
                 comment: dataValues[0]?.comment,
+                attributeOptionCombo: dataValues[0]?.attributeOptionCombo,
+                categoryOptionCombo: dataValues[0]?.categoryOptionCombo,
+                dataElementBasicName: dataValues[0]?.dataElementBasicName,
             };
 
             const revokeResponse = await this.api
@@ -795,6 +976,21 @@ export class MalDataApprovalDefaultRepository implements MalDataApprovalReposito
             console.debug(error);
         }
     }
+
+    private async getSettingByDataSet(dataSetIds: Id[]) {
+        const response = await this.api.models.dataSets
+            .get({
+                fields: { id: true, code: true },
+                filter: { id: { in: dataSetIds } },
+            })
+            .getData();
+
+        return response.objects.map(dataSet => {
+            const settings = approvalReportSettings.dataSets[dataSet.code];
+            if (!settings) throw new Error(`No settings found for dataSet: ${dataSet.code}`);
+            return { ...settings, dataSetId: dataSet.id };
+        });
+    }
 }
 
 const csvFields = ["dataSet", "orgUnit", "period", "completed"] as const;
@@ -848,8 +1044,8 @@ function mergeHeadersAndData(
                 attribute: datavalue?.attribute,
                 approvalWorkflow: datavalue?.approvalworkflow,
                 approvalWorkflowUid: datavalue?.approvalworkflowuid,
-                completed: Boolean(datavalue?.completed),
-                validated: Boolean(datavalue?.validated),
+                completed: datavalue?.completed === "true",
+                validated: datavalue?.validated === "true",
                 lastUpdatedValue: datavalue?.lastupdatedvalue,
                 lastDateOfSubmission: datavalue?.lastdateofsubmission,
                 lastDateOfApproval: datavalue?.lastdateofapproval,
@@ -882,8 +1078,11 @@ function mergeHeadersAndData(
 }
 
 export const MAL_WMR_FORM_CODE = "0MAL_5";
-const dataElementCodes = {
-    MAL_SUBMISSION_DATE: "MAL_SUBMISSION_DATE",
-    MAL_APPROVAL_DATE_APVD: "MAL_APPROVAL_DATE-APVD",
-};
+const MAL_WMR_FORM_APVD_NAME = "MAL - WMR Form-APVD";
 const DEFAULT_COC = "Xr12mI7VPn3";
+
+type D2DataValue = DataValueSetsPostRequest["dataValues"][number];
+
+type D2DataValueResponse = {
+    response?: { data?: { response?: DataValueSetsPostResponse } };
+};
diff --git a/src/data/reports/mal-data-approval/constants/MalDataApprovalConstants.ts b/src/data/reports/mal-data-approval/constants/MalDataApprovalConstants.ts
index 03f5a7d9..1756e706 100644
--- a/src/data/reports/mal-data-approval/constants/MalDataApprovalConstants.ts
+++ b/src/data/reports/mal-data-approval/constants/MalDataApprovalConstants.ts
@@ -3,6 +3,8 @@ export const malDataSetCodes: Record<MalDataSet, string> = {
     "MAL - Antimalarial drug policy": "MAL-ADP",
     "MAL - WMR National Policies": "MAL-WMR-NP",
     "MAL - Malaria Free": "MAL-PR-SF",
+    "NHWA Module 1": "NHWA-M1-2023",
+    "NHWA Module 2": "NHWA-M2-2023",
 };
 
 export const malariaDataSets = [
@@ -10,14 +12,8 @@ export const malariaDataSets = [
     "MAL - Antimalarial drug policy",
     "MAL - WMR National Policies",
     "MAL - Malaria Free",
+    "NHWA Module 1",
+    "NHWA Module 2",
 ] as const;
 
 export type MalDataSet = typeof malariaDataSets[number];
-
-// use correct approved dataset name/codes
-export const malApvdDataSets: Record<MalDataSet, string> = {
-    "MAL - WMR Form": "MAL - WMR Form-APVD",
-    "MAL - Antimalarial drug policy": "MAL-ADP",
-    "MAL - WMR National Policies": "MAL-WMR-NP",
-    "MAL - Malaria Free": "MAL-PR-SF",
-};
diff --git a/src/data/reports/mal-data-subscription/MalDataSubscriptionDefaultRepository.ts b/src/data/reports/mal-data-subscription/MalDataSubscriptionDefaultRepository.ts
index b2230eac..ab0bdf08 100644
--- a/src/data/reports/mal-data-subscription/MalDataSubscriptionDefaultRepository.ts
+++ b/src/data/reports/mal-data-subscription/MalDataSubscriptionDefaultRepository.ts
@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { D2Api } from "../../../types/d2-api";
+import { D2Api, MetadataPick } from "../../../types/d2-api";
 import { DataStoreStorageClient } from "../../common/clients/storage/DataStoreStorageClient";
 import { StorageClient } from "../../common/clients/storage/StorageClient";
 import { Instance } from "../../common/entities/Instance";
@@ -72,24 +72,38 @@ export class MalDataSubscriptionDefaultRepository implements MalDataSubscription
         const subscriptionValues =
             (await this.globalStorageClient.getObject<SubscriptionStatus[]>(Namespaces.MAL_SUBSCRIPTION_STATUS)) ?? [];
 
+        const dataElementFields = {
+            id: true,
+            name: true,
+            code: true,
+            dataElementGroups: { id: true, name: true },
+            dataSetElements: {
+                dataSet: {
+                    id: true,
+                    name: true,
+                    sections: {
+                        id: true,
+                        name: true,
+                        dataElements: { fields: { id: true } },
+                    },
+                },
+            },
+        } as const;
+
+        type D2DataElement = MetadataPick<{
+            dataElements: { fields: typeof dataElementFields };
+        }>["dataElements"][number];
+
         const { dataElements } = await this.api
-            .get<{
-                dataElements: {
-                    id: string;
-                    name: string;
-                    code: string;
-                    dataElementGroups: NamedRef[];
-                    dataSetElements: {
-                        dataSet: {
-                            id: string;
-                            name: string;
-                            sections: { id: string; name: string; dataElements: { id: string }[] }[];
-                        };
-                    }[];
-                }[];
-            }>(
-                `/dataElements?filter=name:ilike:apvd&fields=id,name,code,dataElementGroups[id,name],dataSetElements[dataSet[id,name,sections[id,name,dataElements]]]&paging=false`
-            )
+            .get<{ dataElements: D2DataElement[] }>(`/dataElements`, {
+                filters: [
+                    "name:ilike:apvd",
+                    `dataElementGroups.id:in:${dataElementGroupIds.join(",")}`,
+                    `dataSetElements.dataSet.sections.id:in:${sectionIds.join(",")}`,
+                ],
+                fields: "id,name,code,dataElementGroups[id,name],dataSetElements[dataSet[id,name,sections[id,name,dataElements]]]",
+                paging: false,
+            })
             .getData();
 
         const rows = dataElements
diff --git a/src/domain/common/entities/AppSettings.ts b/src/domain/common/entities/AppSettings.ts
new file mode 100644
index 00000000..bdedfcb8
--- /dev/null
+++ b/src/domain/common/entities/AppSettings.ts
@@ -0,0 +1,23 @@
+import { Code, Id } from "./Base";
+
+export type AppSettings = {
+    dataSets: Record<Code, DataSetSettings>;
+};
+
+export type DataSetSettings = {
+    dataSourceId: Id;
+    oldDataSourceId: Id;
+    dataElements: DataElementSettings;
+    approvalDataSetCode: Code;
+};
+
+export type DataElementSettings = {
+    submissionDate: Code;
+    approvalDate: Code;
+};
+
+export const DATA_ELEMENT_SUFFIX = "-APVD";
+
+export function isValidApprovalDataElement(originalName: string, apvdName: string) {
+    return `${originalName}${DATA_ELEMENT_SUFFIX}`.toLocaleLowerCase() === apvdName.toLocaleLowerCase();
+}
diff --git a/src/domain/common/entities/Base.ts b/src/domain/common/entities/Base.ts
index 2b682964..8938e345 100644
--- a/src/domain/common/entities/Base.ts
+++ b/src/domain/common/entities/Base.ts
@@ -1,6 +1,7 @@
 import _ from "lodash";
 
 export type Id = string;
+export type Code = string;
 
 export interface Ref {
     id: Id;
diff --git a/src/domain/common/entities/Config.ts b/src/domain/common/entities/Config.ts
index 6a6a5eeb..b2f578f1 100644
--- a/src/domain/common/entities/Config.ts
+++ b/src/domain/common/entities/Config.ts
@@ -1,4 +1,5 @@
 import _ from "lodash";
+import { AppSettings } from "./AppSettings";
 import { Id, NamedRef } from "./Base";
 import { getPath } from "./OrgUnit";
 import { User } from "./User";
@@ -19,6 +20,7 @@ export interface Config {
         | undefined;
     years: string[];
     approvalWorkflow: NamedRef[];
+    appSettings: AppSettings;
 }
 
 export function getMainUserPaths(config: Config) {
diff --git a/src/domain/common/entities/DataSet.ts b/src/domain/common/entities/DataSet.ts
index ca7d22e9..5d057d72 100644
--- a/src/domain/common/entities/DataSet.ts
+++ b/src/domain/common/entities/DataSet.ts
@@ -1,8 +1,9 @@
-import { Id } from "./Base";
+import { Code, Id } from "./Base";
 import { OrgUnit } from "./OrgUnit";
 
 export type DataSet = {
     id: Id;
+    code: Code;
     name: string;
     organisationUnits: OrgUnit[];
     dataElements: DataElement[];
diff --git a/src/domain/common/entities/DataSetStatus.ts b/src/domain/common/entities/DataSetStatus.ts
new file mode 100644
index 00000000..92dc781a
--- /dev/null
+++ b/src/domain/common/entities/DataSetStatus.ts
@@ -0,0 +1,8 @@
+import { Struct } from "./Struct";
+
+type DataSetStatusAttrs = {
+    isSubmitted: boolean;
+    isCompleted: boolean;
+};
+
+export class DataSetStatus extends Struct<DataSetStatusAttrs>() {}
diff --git a/src/domain/common/entities/DataValue.ts b/src/domain/common/entities/DataValue.ts
index 67b12cdf..72481153 100644
--- a/src/domain/common/entities/DataValue.ts
+++ b/src/domain/common/entities/DataValue.ts
@@ -2,6 +2,7 @@ import { Id } from "./Base";
 
 export interface DataValue {
     dataElement: Id;
+    dataElementName: string;
     period: string;
     orgUnit: Id;
     categoryOptionCombo: Id;
@@ -23,5 +24,5 @@ export interface DataValuesSelector {
 
 export type DataValueToPost = Omit<
     DataValue & { dataSet?: string },
-    "storedBy" | "created" | "lastUpdated" | "followup" | "deleted" | "attributeOptionCombo"
+    "storedBy" | "created" | "lastUpdated" | "followup" | "deleted" | "attributeOptionCombo" | "dataElementName"
 >;
diff --git a/src/domain/common/entities/DataValueStats.ts b/src/domain/common/entities/DataValueStats.ts
new file mode 100644
index 00000000..625f54c6
--- /dev/null
+++ b/src/domain/common/entities/DataValueStats.ts
@@ -0,0 +1,37 @@
+type DataValueStatsAttrs = {
+    imported: number;
+    updated: number;
+    ignored: number;
+    deleted: number;
+    period: string;
+    orgUnitId: string;
+    dataSetId: string;
+    errorMessages: { message: string }[];
+    strategy: "SAVE" | "DELETE";
+};
+
+export class DataValueStats {
+    public readonly imported: number;
+    public readonly updated: number;
+    public readonly ignored: number;
+    public readonly deleted: number;
+    public readonly errorMessages: { message: string }[];
+    public readonly period: string;
+    public readonly orgUnitId: string;
+    public readonly dataSetId: string;
+    public readonly strategy: "SAVE" | "DELETE";
+
+    constructor(attrs: DataValueStatsAttrs) {
+        this.imported = attrs.imported;
+        this.updated = attrs.updated;
+        this.ignored = attrs.ignored;
+        this.deleted = attrs.deleted;
+        this.period = attrs.period;
+        this.orgUnitId = attrs.orgUnitId;
+        this.dataSetId = attrs.dataSetId;
+        this.errorMessages = (attrs.errorMessages || []).map(error => ({
+            message: error.message,
+        }));
+        this.strategy = attrs.strategy;
+    }
+}
diff --git a/src/domain/common/entities/Struct.ts b/src/domain/common/entities/Struct.ts
new file mode 100644
index 00000000..8b9a6927
--- /dev/null
+++ b/src/domain/common/entities/Struct.ts
@@ -0,0 +1,45 @@
+/**
+ * Base class for typical classes with attributes. Features: create, update.
+ *
+ * ```
+ * class Counter extends Struct<{ id: Id; value: number }>() {
+ *     add(value: number): Counter {
+ *         return this._update({ value: this.value + value });
+ *     }
+ * }
+ *
+ * const counter1 = Counter.create({ id: "some-counter", value: 1 });
+ * const counter2 = counter1._update({ value: 2 });
+ * ```
+ */
+
+export function Struct<Attrs>() {
+    abstract class Base {
+        constructor(_attributes: Attrs) {
+            Object.assign(this, _attributes);
+        }
+
+        _getAttributes(): Attrs {
+            const entries = Object.getOwnPropertyNames(this).map(key => [key, (this as any)[key]]);
+            return Object.fromEntries(entries) as Attrs;
+        }
+
+        protected _update(partialAttrs: Partial<Attrs>): this {
+            const ParentClass = this.constructor as new (values: Attrs) => typeof this;
+            return new ParentClass({ ...this._getAttributes(), ...partialAttrs });
+        }
+
+        static create<U extends Base>(this: new (attrs: Attrs) => U, attrs: Attrs): U {
+            return new this(attrs);
+        }
+    }
+
+    return Base as {
+        new (values: Attrs): Attrs & Base;
+        create: typeof Base["create"];
+    };
+}
+
+const GenericStruct = Struct<unknown>();
+
+export type GenericStructInstance = InstanceType<typeof GenericStruct>;
diff --git a/src/domain/common/entities/User.ts b/src/domain/common/entities/User.ts
index fcc860e8..bec86b37 100644
--- a/src/domain/common/entities/User.ts
+++ b/src/domain/common/entities/User.ts
@@ -8,4 +8,18 @@ export interface User {
     orgUnits: OrgUnit[];
     userRoles: NamedRef[];
     userGroups: NamedRef[];
+    isAdmin: boolean;
+    dataSets?: Record<Id, UserDataSetAction>;
 }
+
+export type UserDataSetAccess = Record<string, UserDataSetAction>;
+
+export type UserDataSetAction = {
+    complete: boolean;
+    incomplete: boolean;
+    monitoring: boolean;
+    read: boolean;
+    revoke: boolean;
+    submit: boolean;
+    approve: boolean;
+};
diff --git a/src/domain/common/repositories/AppSettingsRepository.ts b/src/domain/common/repositories/AppSettingsRepository.ts
new file mode 100644
index 00000000..0626816e
--- /dev/null
+++ b/src/domain/common/repositories/AppSettingsRepository.ts
@@ -0,0 +1,5 @@
+import { AppSettings } from "../entities/AppSettings";
+
+export interface AppSettingsRepository {
+    get(): Promise<AppSettings>;
+}
diff --git a/src/domain/common/repositories/DataSetStatusRepository.ts b/src/domain/common/repositories/DataSetStatusRepository.ts
new file mode 100644
index 00000000..fd35aecd
--- /dev/null
+++ b/src/domain/common/repositories/DataSetStatusRepository.ts
@@ -0,0 +1,12 @@
+import { Id } from "../entities/Base";
+import { DataSetStatus } from "../entities/DataSetStatus";
+
+export interface DataSetStatusRepository {
+    getBy(options: GetOptions): Promise<DataSetStatus>;
+}
+
+type GetOptions = {
+    dataSetId: Id;
+    orgUnitId: Id;
+    period: string;
+};
diff --git a/src/domain/reports/WmrDiffReport.ts b/src/domain/reports/WmrDiffReport.ts
index c155a6c6..fb1461ef 100644
--- a/src/domain/reports/WmrDiffReport.ts
+++ b/src/domain/reports/WmrDiffReport.ts
@@ -1,51 +1,65 @@
 import _ from "lodash";
+import { AppSettings, isValidApprovalDataElement } from "../common/entities/AppSettings";
 import { Id } from "../common/entities/Base";
 import { DataValue } from "../common/entities/DataValue";
 import { DataSetRepository } from "../common/repositories/DataSetRepository";
 import { DataValuesRepository } from "../common/repositories/DataValuesRepository";
 import { DataDiffItem } from "./mal-data-approval/entities/DataDiffItem";
-import { DataSet } from "../common/entities/DataSet";
-import { malApvdDataSets, MalDataSet } from "../../data/reports/mal-data-approval/constants/MalDataApprovalConstants";
+
+export const dataSetApprovalName = "MAL - WMR Form-APVD";
 
 export class WmrDiffReport {
-    constructor(private dataValueRepository: DataValuesRepository, private dataSetRepository: DataSetRepository) {}
+    constructor(
+        private dataValueRepository: DataValuesRepository,
+        private dataSetRepository: DataSetRepository,
+        private settings: AppSettings
+    ) {}
+
+    async getDiff(dataSetId: Id, orgUnitId: Id, period: string, children = false): Promise<DataDiffItem[]> {
+        const dataElements = await this.getDataElements(dataSetId);
+        const dataSet = await this.dataSetRepository.getById(dataSetId);
+        const originalDataSet = dataSet[0];
+        if (!originalDataSet) throw Error(`No data set found: ${dataSetId}`);
+        const settings = this.settings.dataSets[originalDataSet.code];
+        if (!settings) throw Error(`No settings found for data set: ${originalDataSet.code}`);
 
-    async getDiff(dataSetId: Id, orgUnitId: Id, period: string) {
-        const { dataSet, dataElements } = await this.getDataSetWithDataElements(dataSetId);
-        const approvedDataSetCode = malApvdDataSets[dataSet.name as MalDataSet];
-        const dataSetApproval = await this.dataSetRepository.getByNameOrCode(approvedDataSetCode);
-        const approvalDataValues = await this.getDataValues(dataSetApproval.id, orgUnitId, period);
-        const malDataValues = await this.getDataValues(dataSetId, orgUnitId, period);
+        const dataSetApproval = await this.dataSetRepository.getByNameOrCode(settings.approvalDataSetCode);
+        const approvalDataValues = await this.getDataValues(dataSetApproval.id, orgUnitId, period, children);
+        const malDataValues = await this.getDataValues(dataSetId, orgUnitId, period, children);
 
+        // TODO: Refactor this method to use a more efficient approach
+        // this class was not created to deal with dataValues from multiple org units (children = true)
         const dataElementsWithValues = this.filterDataElementsWithDataValue(
             malDataValues,
             approvalDataValues,
             dataElements,
             dataSetId,
-            orgUnitId,
             period
         );
 
         return dataElementsWithValues;
     }
 
-    private async getDataValues(dataSetId: Id, orgUnitId: Id, period: string): Promise<DataValue[]> {
+    private async getDataValues(
+        dataSetId: Id,
+        orgUnitId: Id,
+        period: string,
+        children?: boolean
+    ): Promise<DataValue[]> {
         const dataValues = await this.dataValueRepository.get({
             dataSetIds: [dataSetId],
             periods: [period],
             orgUnitIds: [orgUnitId],
+            children: children,
         });
         return dataValues;
     }
 
-    private async getDataSetWithDataElements(
-        dataSetId: Id
-    ): Promise<{ dataElements: DataElementsWithCombination[]; dataSet: DataSet }> {
+    private async getDataElements(dataSetId: Id): Promise<DataElementsWithCombination[]> {
         const dataSets = await this.dataSetRepository.getById(dataSetId);
         const dataSet = _(dataSets).first();
         if (!dataSet) throw Error("No data set found");
-
-        const dataElementsWithCombination = dataSet.dataElements.flatMap(dataElement => {
+        return dataSet.dataElements.flatMap(dataElement => {
             const combinations = dataElement.categoryCombo?.categoryOptionCombos || [];
 
             return combinations.map((combination): DataElementsWithCombination => {
@@ -58,8 +72,6 @@ export class WmrDiffReport {
                 };
             });
         });
-
-        return { dataElements: dataElementsWithCombination, dataSet: dataSet };
     }
 
     private filterDataElementsWithDataValue(
@@ -67,40 +79,63 @@ export class WmrDiffReport {
         approvalDataValues: DataValue[],
         dataElements: DataElementsWithCombination[],
         malariaDataSetId: Id,
-        orgUnitId: Id,
         period: string
     ): DataDiffItem[] {
-        return _(dataElements)
-            .map(dataElement => {
-                const malariaDataValue = _(malariaDataValues).find(
-                    dataValue =>
-                        dataValue.dataElement === dataElement.id &&
-                        dataValue.categoryOptionCombo === dataElement.categoryOptionCombo
-                );
-
-                const approvalDataValue = _(approvalDataValues).find(
-                    dataValue =>
-                        dataValue.dataElement.toLowerCase() === dataElement.id.toLowerCase() &&
-                        dataValue.categoryOptionCombo === dataElement.categoryOptionCombo
-                );
-
-                if (!malariaDataValue && !approvalDataValue) return undefined;
-                if (malariaDataValue?.value === approvalDataValue?.value) return undefined;
+        const malariaOrgUnits = _(malariaDataValues)
+            .map(dataValue => dataValue.orgUnit)
+            .uniq()
+            .value();
 
-                return {
-                    dataSetUid: malariaDataSetId,
-                    orgUnitUid: orgUnitId,
-                    period: period,
-                    value: approvalDataValue && !malariaDataValue ? "" : malariaDataValue?.value,
-                    dataElement: this.buildDataElementNameWithCombination(dataElement),
-                    comment: malariaDataValue?.comment,
-                    apvdDataElement: approvalDataValue?.dataElement,
-                    apvdValue: approvalDataValue?.value,
-                    apvdComment: approvalDataValue?.comment,
-                };
-            })
-            .compact()
+        const apvdOrgUnits = _(approvalDataValues)
+            .map(dataValue => dataValue.orgUnit)
+            .uniq()
             .value();
+
+        const allOrgUnits = _(malariaOrgUnits).concat(apvdOrgUnits).uniq().value();
+
+        return allOrgUnits.flatMap(orgUnitId => {
+            return _(dataElements)
+                .map(dataElement => {
+                    const malariaDataValue = _(malariaDataValues).find(
+                        dataValue =>
+                            dataValue.dataElement === dataElement.id &&
+                            dataValue.categoryOptionCombo === dataElement.categoryOptionCombo &&
+                            dataValue.orgUnit === orgUnitId &&
+                            dataValue.period === period
+                    );
+
+                    const approvalDataValue = _(approvalDataValues).find(
+                        dataValue =>
+                            isValidApprovalDataElement(dataElement.name, dataValue.dataElementName) &&
+                            dataValue.categoryOptionCombo === dataElement.categoryOptionCombo &&
+                            dataValue.orgUnit === orgUnitId &&
+                            dataValue.period === period
+                    );
+
+                    if (!malariaDataValue && !approvalDataValue) return undefined;
+                    if (!malariaDataValue?.value && !approvalDataValue?.value) return undefined;
+                    if (malariaDataValue?.value === approvalDataValue?.value) return undefined;
+
+                    return {
+                        dataSetUid: malariaDataSetId,
+                        orgUnitUid: orgUnitId,
+                        period: period,
+                        value: approvalDataValue && !malariaDataValue ? "" : malariaDataValue?.value,
+                        dataElement: this.buildDataElementNameWithCombination(dataElement),
+                        comment: malariaDataValue?.comment,
+                        apvdDataElement: approvalDataValue?.dataElement,
+                        apvdValue: approvalDataValue?.value,
+                        apvdComment: approvalDataValue?.comment,
+                        attributeOptionCombo:
+                            malariaDataValue?.attributeOptionCombo ?? approvalDataValue?.attributeOptionCombo,
+                        categoryOptionCombo:
+                            malariaDataValue?.categoryOptionCombo ?? approvalDataValue?.categoryOptionCombo,
+                        dataElementBasicName: dataElement.name,
+                    };
+                })
+                .compact()
+                .value();
+        });
     }
 
     private buildDataElementNameWithCombination(dataElement: DataElementsWithCombination): string {
diff --git a/src/domain/reports/mal-data-approval/entities/DataDiffItem.ts b/src/domain/reports/mal-data-approval/entities/DataDiffItem.ts
index 71d42e49..b772b4de 100644
--- a/src/domain/reports/mal-data-approval/entities/DataDiffItem.ts
+++ b/src/domain/reports/mal-data-approval/entities/DataDiffItem.ts
@@ -8,6 +8,9 @@ export interface DataDiffItem {
     apvdDataElement: string | undefined;
     comment: string | undefined;
     apvdComment: string | undefined;
+    attributeOptionCombo: string | undefined;
+    categoryOptionCombo: string | undefined;
+    dataElementBasicName: string | undefined;
 }
 
 export interface DataDiffItemIdentifier {
@@ -18,6 +21,9 @@ export interface DataDiffItemIdentifier {
     value: string;
     apvdValue: string;
     comment?: string;
+    attributeOptionCombo: string | undefined;
+    categoryOptionCombo: string | undefined;
+    dataElementBasicName: string | undefined;
 }
 
 export function getDataDiffItemId(item: DataDiffItem): string {
@@ -29,13 +35,38 @@ export function getDataDiffItemId(item: DataDiffItem): string {
         item.value,
         item.apvdValue,
         item.comment,
+        item.attributeOptionCombo,
+        item.categoryOptionCombo,
+        item.dataElementBasicName,
     ].join("|||");
 }
 
 export function parseDataDiffItemId(string: string): DataDiffItemIdentifier | undefined {
-    const [dataSet, period, orgUnit, dataElement, value = "", apvdValue = "", comment] = string.split("|||");
+    const [
+        dataSet,
+        period,
+        orgUnit,
+        dataElement,
+        value = "",
+        apvdValue = "",
+        comment,
+        attributeOptionCombo,
+        categoryOptionCombo,
+        dataElementBasicName,
+    ] = string.split("|||");
 
     if (!dataSet || !period || !orgUnit || !dataElement) return undefined;
 
-    return { dataSet, period, orgUnit, dataElement, value, apvdValue, comment };
+    return {
+        dataSet,
+        period,
+        orgUnit,
+        dataElement,
+        value,
+        apvdValue,
+        comment,
+        attributeOptionCombo: attributeOptionCombo,
+        categoryOptionCombo: categoryOptionCombo,
+        dataElementBasicName: dataElementBasicName,
+    };
 }
diff --git a/src/domain/reports/mal-data-approval/repositories/MalDataApprovalRepository.ts b/src/domain/reports/mal-data-approval/repositories/MalDataApprovalRepository.ts
index 8b5d1243..a5a684c0 100644
--- a/src/domain/reports/mal-data-approval/repositories/MalDataApprovalRepository.ts
+++ b/src/domain/reports/mal-data-approval/repositories/MalDataApprovalRepository.ts
@@ -1,14 +1,12 @@
 import { Id } from "../../../common/entities/Base";
 import { Config } from "../../../common/entities/Config";
 import { PaginatedObjects, Paging, Sorting } from "../../../common/entities/PaginatedObjects";
-import { DataDiffItem } from "../entities/DataDiffItem";
 import { MalDataApprovalItem, MalDataApprovalItemIdentifier } from "../entities/MalDataApprovalItem";
 import { DataDiffItemIdentifier } from "../entities/DataDiffItem";
-import { Maybe } from "../../../../types/utils";
+import { DataValueStats } from "../../../common/entities/DataValueStats";
 
 export interface MalDataApprovalRepository {
     get(options: MalDataApprovalOptions): Promise<PaginatedObjects<MalDataApprovalItem>>;
-    getDiff(options: MalDataApprovalOptions): Promise<PaginatedObjects<DataDiffItem>>;
     save(filename: string, dataSets: MalDataApprovalItem[]): Promise<void>;
     complete(dataSets: MalDataApprovalItemIdentifier[]): Promise<boolean>;
     approve(dataSets: MalDataApprovalItemIdentifier[]): Promise<boolean>;
@@ -17,6 +15,7 @@ export interface MalDataApprovalRepository {
         dataElementsWithValues: DataDiffItemIdentifier[]
     ): Promise<boolean>;
     duplicateDataValues(dataSets: DataDiffItemIdentifier[]): Promise<boolean>;
+    replicateDataValuesInApvdDataSet(dataSets: DataDiffItemIdentifier[]): Promise<DataValueStats[]>;
     duplicateDataValuesAndRevoke(dataSets: DataDiffItemIdentifier[]): Promise<boolean>;
     incomplete(dataSets: MalDataApprovalItemIdentifier[]): Promise<boolean>;
     unapprove(dataSets: MalDataApprovalItemIdentifier[]): Promise<boolean>;
@@ -33,7 +32,9 @@ export interface MalDataApprovalOptions {
     periods: string[];
     useOldPeriods?: boolean;
     orgUnitIds: Id[];
-    dataSetId: Maybe<Id>;
+    dataSetId: Id;
     approvalStatus?: boolean;
     completionStatus?: boolean;
+    isApproved?: boolean;
+    modificationCount?: string | undefined;
 }
diff --git a/src/domain/reports/mal-data-approval/usecases/ApproveMalDataValuesUseCase.ts b/src/domain/reports/mal-data-approval/usecases/ApproveMalDataValuesUseCase.ts
new file mode 100644
index 00000000..4e01d479
--- /dev/null
+++ b/src/domain/reports/mal-data-approval/usecases/ApproveMalDataValuesUseCase.ts
@@ -0,0 +1,53 @@
+import _ from "lodash";
+import { UseCase } from "../../../../compositionRoot";
+import { DataValueStats } from "../../../common/entities/DataValueStats";
+import { DataSetRepository } from "../../../common/repositories/DataSetRepository";
+import { dataSetApprovalName } from "../../WmrDiffReport";
+import { DataDiffItemIdentifier } from "../entities/DataDiffItem";
+import { MalDataApprovalRepository } from "../repositories/MalDataApprovalRepository";
+
+export class ApproveMalDataValuesUseCase implements UseCase {
+    constructor(private dataSetRepository: DataSetRepository, private approvalRepository: MalDataApprovalRepository) {}
+
+    async execute(items: DataDiffItemIdentifier[]): Promise<DataValueStats[]> {
+        const approvalDataSet = await this.dataSetRepository.getByNameOrCode(dataSetApprovalName);
+        const assignedOrgUnitIds = approvalDataSet.organisationUnits.map(ou => ou.id);
+        const dataValuesOrgUnitIds = _(items)
+            .map(item => item.orgUnit)
+            .uniq()
+            .value();
+
+        const nonAssignedOrgUnits = _.difference(dataValuesOrgUnitIds, assignedOrgUnitIds);
+        const notAssignedOrgUnitsStast = nonAssignedOrgUnits.map(orgUnitId => {
+            return new DataValueStats({
+                imported: 0,
+                updated: 0,
+                ignored: 0,
+                deleted: 0,
+                period: "",
+                orgUnitId: orgUnitId,
+                dataSetId: approvalDataSet.id,
+                errorMessages: [
+                    { message: `Org unit ${orgUnitId} is not assigned to the approval dataSet ${approvalDataSet.id}` },
+                ],
+                strategy: "SAVE",
+            });
+        });
+
+        const dataValuesWithoutNonAssignedOrgUnits =
+            nonAssignedOrgUnits.length > 0
+                ? items.filter(item => (nonAssignedOrgUnits.includes(item.orgUnit) ? false : true))
+                : items;
+
+        const stats = await this.approvalRepository.replicateDataValuesInApvdDataSet(
+            dataValuesWithoutNonAssignedOrgUnits
+        );
+
+        return stats.concat(notAssignedOrgUnitsStast);
+    }
+}
+
+export type ApproveMalDataValuesOptions = {
+    items: DataDiffItemIdentifier[];
+    approvalDataSetId: string;
+};
diff --git a/src/domain/reports/mal-data-approval/usecases/DuplicateDataValuesUseCase.ts b/src/domain/reports/mal-data-approval/usecases/DuplicateDataValuesUseCase.ts
index f9b134fb..a3006123 100644
--- a/src/domain/reports/mal-data-approval/usecases/DuplicateDataValuesUseCase.ts
+++ b/src/domain/reports/mal-data-approval/usecases/DuplicateDataValuesUseCase.ts
@@ -5,11 +5,8 @@ import { MalDataApprovalRepository } from "../repositories/MalDataApprovalReposi
 export class DuplicateDataValuesUseCase implements UseCase {
     constructor(private approvalRepository: MalDataApprovalRepository) {}
 
-    async execute(items: DataDiffItemIdentifier[], revoke?: boolean): Promise<boolean> {
-        if (revoke) {
-            return this.approvalRepository.duplicateDataValuesAndRevoke(items);
-        } else {
-            return this.approvalRepository.duplicateDataValues(items);
-        }
+    async execute(items: DataDiffItemIdentifier[]): Promise<boolean> {
+        const stats = await this.approvalRepository.replicateDataValuesInApvdDataSet(items);
+        return stats.filter(stat => stat.errorMessages.length > 0).length === 0;
     }
 }
diff --git a/src/domain/reports/mal-data-approval/usecases/GetMalDataDiffUseCase.ts b/src/domain/reports/mal-data-approval/usecases/GetMalDataDiffUseCase.ts
index a1fa5520..6634fe32 100644
--- a/src/domain/reports/mal-data-approval/usecases/GetMalDataDiffUseCase.ts
+++ b/src/domain/reports/mal-data-approval/usecases/GetMalDataDiffUseCase.ts
@@ -1,6 +1,7 @@
 import _ from "lodash";
 import { UseCase } from "../../../../compositionRoot";
 import { PaginatedObjects, Sorting } from "../../../common/entities/PaginatedObjects";
+import { AppSettingsRepository } from "../../../common/repositories/AppSettingsRepository";
 import { DataSetRepository } from "../../../common/repositories/DataSetRepository";
 import { DataValuesRepository } from "../../../common/repositories/DataValuesRepository";
 import { WmrDiffReport } from "../../WmrDiffReport";
@@ -10,9 +11,14 @@ import { MalDataApprovalOptions } from "../repositories/MalDataApprovalRepositor
 type GetDataDiffUseCaseOptions = Omit<MalDataApprovalOptions, "sorting"> & { sorting: Sorting<DataDiffItem> };
 
 export class GetMalDataDiffUseCase implements UseCase {
-    constructor(private dataValueRepository: DataValuesRepository, private dataSetRepository: DataSetRepository) {}
+    constructor(
+        private dataValueRepository: DataValuesRepository,
+        private dataSetRepository: DataSetRepository,
+        private appSettings: AppSettingsRepository
+    ) {}
 
     async execute(options: GetDataDiffUseCaseOptions): Promise<PaginatedObjects<DataDiffItem>> {
+        const settings = await this.appSettings.get();
         const malariaDataSetId = options.dataSetId;
         const orgUnitId = _(options.orgUnitIds).first();
         const period = _(options.periods).first();
@@ -22,7 +28,8 @@ export class GetMalDataDiffUseCase implements UseCase {
 
         const dataElementsWithValues = await new WmrDiffReport(
             this.dataValueRepository,
-            this.dataSetRepository
+            this.dataSetRepository,
+            settings
         ).getDiff(malariaDataSetId, orgUnitId, period);
 
         return {
diff --git a/src/domain/reports/mal-data-approval/usecases/GetMalDataSetsUseCase.ts b/src/domain/reports/mal-data-approval/usecases/GetMalDataSetsUseCase.ts
index 688e9967..c7aeb087 100644
--- a/src/domain/reports/mal-data-approval/usecases/GetMalDataSetsUseCase.ts
+++ b/src/domain/reports/mal-data-approval/usecases/GetMalDataSetsUseCase.ts
@@ -1,6 +1,8 @@
 import { UseCase } from "../../../../compositionRoot";
 import { promiseMap } from "../../../../utils/promises";
+import { Id } from "../../../common/entities/Base";
 import { PaginatedObjects } from "../../../common/entities/PaginatedObjects";
+import { AppSettingsRepository } from "../../../common/repositories/AppSettingsRepository";
 import { DataSetRepository } from "../../../common/repositories/DataSetRepository";
 import { DataValuesRepository } from "../../../common/repositories/DataValuesRepository";
 import { WmrDiffReport } from "../../WmrDiffReport";
@@ -9,36 +11,52 @@ import { getDataDuplicationItemMonitoringValue } from "../entities/MonitoringVal
 import { MalDataApprovalRepository, MalDataApprovalOptions } from "../repositories/MalDataApprovalRepository";
 import { MonitoringValueRepository } from "../repositories/MonitoringValueRepository";
 
-type DataSetsOptions = MalDataApprovalOptions;
+type DataSetsOptions = Omit<MalDataApprovalOptions, "dataSetId"> & { dataSetIds: Id[] };
 
 export class GetMalDataSetsUseCase implements UseCase {
     constructor(
         private malDataRepository: MalDataApprovalRepository,
         private dataValueRepository: DataValuesRepository,
         private dataSetRepository: DataSetRepository,
-        private monitoringValueRepository: MonitoringValueRepository
+        private monitoringValueRepository: MonitoringValueRepository,
+        private appSettingsRepository: AppSettingsRepository
     ) {}
 
     async execute(
         monitoringNamespace: string,
         options: DataSetsOptions
     ): Promise<PaginatedObjects<MalDataApprovalItem>> {
-        const result = await this.malDataRepository.get(options);
-        const monitoringValue = await this.monitoringValueRepository.get(monitoringNamespace);
-
-        const response = await promiseMap(result.objects, async item => {
-            const dataElementsWithValues = await new WmrDiffReport(
-                this.dataValueRepository,
-                this.dataSetRepository
-            ).getDiff(item.dataSetUid, item.orgUnitUid, item.period);
-
-            return {
-                ...item,
-                monitoring: monitoringValue ? getDataDuplicationItemMonitoringValue(item, monitoringValue) : false,
-                modificationCount: dataElementsWithValues.length > 0 ? String(dataElementsWithValues.length) : "",
-            };
+        const appSettings = await this.appSettingsRepository.get();
+
+        if (options.dataSetIds.length === 0)
+            return Promise.resolve({ objects: [], pager: { page: 0, pageCount: 0, pageSize: 0, total: 0 } });
+
+        const allRecords = await promiseMap(options.dataSetIds, async dataSetId => {
+            const { dataSetIds: _, ...rest } = options;
+            const result = await this.malDataRepository.get({ ...rest, dataSetId: dataSetId });
+            const monitoringValue = await this.monitoringValueRepository.get(monitoringNamespace);
+
+            const response = await promiseMap(result.objects, async item => {
+                const dataElementsWithValues = await new WmrDiffReport(
+                    this.dataValueRepository,
+                    this.dataSetRepository,
+                    appSettings
+                ).getDiff(item.dataSetUid, item.orgUnitUid, item.period);
+
+                return {
+                    ...item,
+                    monitoring: monitoringValue ? getDataDuplicationItemMonitoringValue(item, monitoringValue) : false,
+                    modificationCount: dataElementsWithValues.length > 0 ? String(dataElementsWithValues.length) : "",
+                };
+            });
+
+            return { ...result, objects: response };
         });
 
-        return { ...result, objects: response };
+        const allObjects = allRecords.flatMap(record => record.objects);
+        const pagination = allRecords[0]?.pager;
+        if (!pagination) throw new Error("No pagination information found");
+
+        return { objects: allObjects, pager: { ...pagination, total: allObjects.length } };
     }
 }
diff --git a/src/domain/reports/mal-data-approval/usecases/UpdateMalApprovalStatusUseCase.ts b/src/domain/reports/mal-data-approval/usecases/UpdateMalApprovalStatusUseCase.ts
index 36e882aa..78864c12 100644
--- a/src/domain/reports/mal-data-approval/usecases/UpdateMalApprovalStatusUseCase.ts
+++ b/src/domain/reports/mal-data-approval/usecases/UpdateMalApprovalStatusUseCase.ts
@@ -6,38 +6,65 @@ import { WmrDiffReport } from "../../WmrDiffReport";
 import { MalDataApprovalItemIdentifier } from "../entities/MalDataApprovalItem";
 import { MalDataApprovalRepository } from "../repositories/MalDataApprovalRepository";
 import { DataDiffItemIdentifier } from "../entities/DataDiffItem";
+import { AppSettingsRepository } from "../../../common/repositories/AppSettingsRepository";
 
 export class UpdateMalApprovalStatusUseCase {
     constructor(
         private approvalRepository: MalDataApprovalRepository,
         private dataValueRepository: DataValuesRepository,
-        private dataSetRepository: DataSetRepository
+        private dataSetRepository: DataSetRepository,
+        private appSettingsRepository: AppSettingsRepository
     ) {}
 
     async execute(items: MalDataApprovalItemIdentifier[], action: UpdateAction): Promise<boolean> {
-        switch (action) {
-            case "complete":
-                return this.approvalRepository.complete(items);
-            case "approve":
-                return this.approvalRepository.approve(items);
-            case "duplicate": {
-                const dataElementsWithValues = await this.getDataElementsToDuplicate(items);
-                return this.approvalRepository.duplicateDataSets(items, dataElementsWithValues);
+        const itemsByDataSet = _(items)
+            .groupBy(item => item.dataSet)
+            .value();
+
+        const dataSetIds = _(items)
+            .map(item => item.dataSet)
+            .uniq()
+            .value();
+
+        const result = await promiseMap(dataSetIds, async dataSetId => {
+            const itemsToUpdate = itemsByDataSet[dataSetId];
+            if (!itemsToUpdate) return true;
+
+            switch (action) {
+                case "complete":
+                    return this.approvalRepository.complete(itemsToUpdate);
+                case "approve":
+                    // "Submit" in UI
+                    return this.approvalRepository.approve(itemsToUpdate);
+                case "duplicate": {
+                    // "Approve" in UI
+                    const dataElementsWithValues = await this.getDataElementsToDuplicate(itemsToUpdate);
+                    const stats = await this.approvalRepository.replicateDataValuesInApvdDataSet(
+                        dataElementsWithValues
+                    );
+                    return stats.filter(stats => stats.errorMessages.length > 0).length === 0;
+                }
+                case "revoke": {
+                    const revokeResult = await this.approvalRepository.unapprove(itemsToUpdate);
+                    const incompleteResult = await this.approvalRepository.incomplete(itemsToUpdate);
+                    return revokeResult && incompleteResult;
+                }
+                case "incomplete":
+                    return this.approvalRepository.incomplete(itemsToUpdate);
+                default:
+                    return false;
             }
-            case "revoke":
-                return this.approvalRepository.unapprove(items);
-            case "incomplete":
-                return this.approvalRepository.incomplete(items);
-            default:
-                return false;
-        }
+        });
+
+        return _(result).every(res => res === true);
     }
 
     private async getDataElementsToDuplicate(
         items: MalDataApprovalItemIdentifier[]
     ): Promise<DataDiffItemIdentifier[]> {
+        const settings = await this.appSettingsRepository.get();
         const dataElementsWithValues = await promiseMap(items, async item => {
-            return await new WmrDiffReport(this.dataValueRepository, this.dataSetRepository).getDiff(
+            return await new WmrDiffReport(this.dataValueRepository, this.dataSetRepository, settings).getDiff(
                 item.dataSet,
                 item.orgUnit,
                 item.period
@@ -58,6 +85,9 @@ export class UpdateMalApprovalStatusUseCase {
                     value: value ?? "",
                     apvdValue: apvdValue ?? "",
                     comment: comment,
+                    attributeOptionCombo: dataElementWithValues.attributeOptionCombo,
+                    categoryOptionCombo: dataElementWithValues.categoryOptionCombo,
+                    dataElementBasicName: dataElementWithValues.dataElementBasicName,
                 };
             })
             .compact()
diff --git a/src/domain/reports/mal-data-approval/usecases/UpdateMonitoringUseCase.ts b/src/domain/reports/mal-data-approval/usecases/UpdateMonitoringUseCase.ts
index 16517c62..9c0cbf79 100644
--- a/src/domain/reports/mal-data-approval/usecases/UpdateMonitoringUseCase.ts
+++ b/src/domain/reports/mal-data-approval/usecases/UpdateMonitoringUseCase.ts
@@ -48,7 +48,7 @@ function buildMonitoringValue(
         ...monitoringValue,
         dataSets: {
             ...monitoringValue.dataSets,
-            [dataSetName]: monitoringValue.dataSets[dataSetName].map(dataSet => {
+            [dataSetName]: monitoringValue.dataSets[dataSetName]?.map(dataSet => {
                 return dataApprovalItems.map(dataApprovalItem => {
                     const matchingMonitoringItem = dataSet.monitoring.find(
                         monitoringItem =>
@@ -85,4 +85,4 @@ function buildMonitoringValue(
     return updatedMonitoringValue;
 }
 
-const malDataNotificationsUserGroup = "MAL_Data_Notifications";
+const malDataNotificationsUserGroup = "NHWA administrators";
diff --git a/src/domain/reports/mal-data-approval/usecases/utils/dataSets.ts b/src/domain/reports/mal-data-approval/usecases/utils/dataSets.ts
new file mode 100644
index 00000000..ad6c4d41
--- /dev/null
+++ b/src/domain/reports/mal-data-approval/usecases/utils/dataSets.ts
@@ -0,0 +1,19 @@
+import { promiseMap } from "../../../../../utils/promises";
+import { Id } from "../../../../common/entities/Base";
+import { DataSetStatusRepository } from "../../../../common/repositories/DataSetStatusRepository";
+
+export class DataSetUtils {
+    constructor(private dataSetStatusRepository: DataSetStatusRepository) {}
+
+    async validateDataSetsStatus(options: Array<{ dataSetId: Id; orgUnitId: Id; period: string }>) {
+        await promiseMap(options, async option => {
+            if (!option.dataSetId || !option.orgUnitId || !option.period)
+                throw new Error("DataSet, OrgUnit or Period not found");
+
+            const status = await this.dataSetStatusRepository.getBy(option);
+            if (status.isSubmitted) {
+                throw new Error(`DataSet cannot be approved because is already submitted`);
+            }
+        });
+    }
+}
diff --git a/src/domain/usecases/GetAppSettingsUseCase.ts b/src/domain/usecases/GetAppSettingsUseCase.ts
new file mode 100644
index 00000000..996a6b46
--- /dev/null
+++ b/src/domain/usecases/GetAppSettingsUseCase.ts
@@ -0,0 +1,10 @@
+import { AppSettings } from "../common/entities/AppSettings";
+import { AppSettingsRepository } from "../common/repositories/AppSettingsRepository";
+
+export class GetAppSettingsUseCase {
+    constructor(private appSettingsRepository: AppSettingsRepository) {}
+
+    execute(): Promise<AppSettings> {
+        return this.appSettingsRepository.get();
+    }
+}
diff --git a/src/domain/usecases/GetDataSetStatusUseCase.ts b/src/domain/usecases/GetDataSetStatusUseCase.ts
new file mode 100644
index 00000000..d0d6de8f
--- /dev/null
+++ b/src/domain/usecases/GetDataSetStatusUseCase.ts
@@ -0,0 +1,11 @@
+import { Id } from "../common/entities/Base";
+import { DataSetStatus } from "../common/entities/DataSetStatus";
+import { DataSetStatusRepository } from "../common/repositories/DataSetStatusRepository";
+
+export class GetDataSetStatusUseCase {
+    constructor(private dataSetStatusRepository: DataSetStatusRepository) {}
+
+    execute(options: { dataSetId: Id; orgUnitId: Id; period: string }): Promise<DataSetStatus> {
+        return this.dataSetStatusRepository.getBy(options);
+    }
+}
diff --git a/src/scripts/approve-mal-datavalues.ts b/src/scripts/approve-mal-datavalues.ts
index 628b0e48..665fa547 100644
--- a/src/scripts/approve-mal-datavalues.ts
+++ b/src/scripts/approve-mal-datavalues.ts
@@ -13,11 +13,13 @@ import { CodedRef } from "../domain/common/entities/Ref";
 import { WmrDiffReport } from "../domain/reports/WmrDiffReport";
 import { promiseMap } from "../utils/promises";
 import { DataDiffItemIdentifier } from "../domain/reports/mal-data-approval/entities/DataDiffItem";
-import { DuplicateDataValuesUseCase } from "../domain/reports/mal-data-approval/usecases/DuplicateDataValuesUseCase";
+import { ApproveMalDataValuesUseCase } from "../domain/reports/mal-data-approval/usecases/ApproveMalDataValuesUseCase";
+import { writeFileSync } from "fs";
+import { AppSettingsD2Repository } from "../data/AppSettingsD2Repository";
 
-const START_YEAR = 2000;
-const END_YEAR = new Date().getFullYear() - 1;
-const globalOU = "WHO-HQ";
+const GLOBAL_OU = "WHO-HQ";
+const DEFAULT_START_YEAR = 2005;
+const DEFAULT_END_YEAR = new Date().getFullYear() - 2;
 
 type ApprovalOptions = {
     baseUrl: string;
@@ -37,7 +39,6 @@ export async function approveMalDataValues(options: ApprovalOptions): Promise<vo
     const dataSetRepository = new DataSetD2Repository(api);
 
     const { dataSet, orgUnit } = await getMalWMRMetadata(api, ouOption);
-
     const malDataApprovalItems = await buildMalApprovalItems(
         dataValueRepository,
         dataSetRepository,
@@ -51,18 +52,16 @@ export async function approveMalDataValues(options: ApprovalOptions): Promise<vo
         return;
     }
 
-    const duplicateDataValueUseCase = new DuplicateDataValuesUseCase(approvalRepository);
-    await duplicateDataValueUseCase
+    const approveDataValuesUseCase = new ApproveMalDataValuesUseCase(dataSetRepository, approvalRepository);
+    await approveDataValuesUseCase
         .execute(malDataApprovalItems)
         .catch(err => {
             console.error("Error approving data values:", err);
         })
-        .then(response => {
-            if (response) {
-                console.debug(
-                    `Successfully approved ${malDataApprovalItems.length} data values in ${dataSet.name} dataset.`
-                );
-            }
+        .then(stats => {
+            const fileNameStats = "mal-data-approval-stats.json";
+            writeFileSync(fileNameStats, JSON.stringify(stats, null, 2));
+            console.debug(`Finished. Stats saved to ${fileNameStats}`);
         });
 }
 
@@ -76,7 +75,7 @@ async function getMalWMRMetadata(api: D2Api, ouOption: string): Promise<{ dataSe
         getMetadataByIdentifiableToken({
             api: api,
             metadataType: "organisationUnits",
-            token: ouOption ?? globalOU,
+            token: ouOption ?? GLOBAL_OU,
         }),
     ]);
 
@@ -90,12 +89,21 @@ async function buildMalApprovalItems(
     orgUnitId: Id,
     yearOption?: string
 ): Promise<DataDiffItemIdentifier[]> {
-    const periods = yearOption ? [yearOption] : _.range(START_YEAR, END_YEAR).map(year => year.toString());
+    const appSettings = await new AppSettingsD2Repository().get();
+    const periods = yearOption
+        ? [yearOption]
+        : _.range(DEFAULT_START_YEAR, DEFAULT_END_YEAR + 1).map(year => year.toString());
     const dataValuesToApprove = await promiseMap(periods, async period => {
-        const dataElementsWithValues = await new WmrDiffReport(dataValueRepository, dataSetRepository).getDiff(
+        console.debug(`Fetching dataValues for period ${period}...`);
+        const dataElementsWithValues = await new WmrDiffReport(
+            dataValueRepository,
+            dataSetRepository,
+            appSettings
+        ).getDiff(
             dataSetId,
             orgUnitId,
-            period
+            period,
+            true // Include children
         );
 
         return dataElementsWithValues.map(dataElementWithValues => ({
@@ -106,6 +114,9 @@ async function buildMalApprovalItems(
             value: dataElementWithValues.value ?? "",
             apvdValue: dataElementWithValues.apvdValue ?? "",
             comment: dataElementWithValues.comment,
+            attributeOptionCombo: dataElementWithValues.attributeOptionCombo,
+            categoryOptionCombo: dataElementWithValues.categoryOptionCombo,
+            dataElementBasicName: dataElementWithValues.dataElementBasicName,
         }));
     });
 
@@ -114,7 +125,7 @@ async function buildMalApprovalItems(
 
 async function main() {
     const parser = new ArgumentParser({
-        description: `Approve all data values in MAL WMR Form from ${START_YEAR} to ${END_YEAR}`,
+        description: `Approve data values in MAL WMR Form`,
     });
 
     parser.add_argument("-u", "--user-auth", {
@@ -132,7 +143,7 @@ async function main() {
     parser.add_argument("-ou", "--org-unit", {
         help: "Organisation unit identifier",
         metavar: "ORG_UNIT",
-        default: globalOU,
+        default: GLOBAL_OU,
     });
 
     parser.add_argument("-y", "--year", {
diff --git a/src/scripts/build.ts b/src/scripts/build.ts
index 55ef4802..8ff32c67 100644
--- a/src/scripts/build.ts
+++ b/src/scripts/build.ts
@@ -9,16 +9,8 @@ function run(cmd: string): void {
 export async function build(): Promise<void> {
     const report = process.env.REACT_APP_REPORT_VARIANT;
     console.debug(`Report type: ${report}`);
-    if (process.env.REACT_APP_REPORT_VARIANT === "mal-approval-status") {
-        console.debug("Building DHIS2 MAL Approval Report");
-        run("yarn mal-build");
-    } else if (report) {
-        console.debug(`Building ${report} DHIS2 Report`);
-        run(`yarn ${report}-build`);
-    } else {
-        console.debug("Building DHIS2 Reports");
-        run("yarn build-default");
-    }
+    console.debug("Building DHIS2 Approval Report");
+    run("yarn mal-build");
 }
 
 async function main() {
diff --git a/src/scripts/check-data-differences.ts b/src/scripts/check-data-differences.ts
index 3f2dabd6..86f80321 100644
--- a/src/scripts/check-data-differences.ts
+++ b/src/scripts/check-data-differences.ts
@@ -6,10 +6,15 @@ import { DataValuesD2Repository } from "../data/common/DataValuesD2Repository";
 import { DataSetD2Repository } from "../data/common/DataSetD2Repository";
 import { getMetadataByIdentifiableToken } from "../data/common/utils/getMetadataByIdentifiableToken";
 import { CodedRef } from "../domain/common/entities/Ref";
-import { WmrDiffReport } from "../domain/reports/WmrDiffReport";
+import { Id } from "../domain/common/entities/Base";
+import _ from "lodash";
+import { promiseMap } from "../utils/promises";
+import { dataSetApprovalName, WmrDiffReport } from "../domain/reports/WmrDiffReport";
+import { AppSettingsD2Repository } from "../data/AppSettingsD2Repository";
 
-const ANGOLA_ORG_UNIT_NAME = "Republic of Angola";
-const YEAR = "2024";
+const GLOBAL_OU = "WHO-HQ";
+const DEFAULT_START_YEAR = 2005;
+const DEFAULT_END_YEAR = new Date().getFullYear() - 2;
 
 type DataDifferencesOptions = {
     baseUrl: string;
@@ -34,25 +39,58 @@ export async function checkMalDataValuesDiff(options: DataDifferencesOptions): P
     const dataSetRepository = new DataSetD2Repository(api);
 
     const { dataSet, orgUnit } = await getMalWMRMetadata(api, ouOption);
-    const period = yearOption ?? YEAR;
-    const dataElementsWithValues = await new WmrDiffReport(dataValueRepository, dataSetRepository).getDiff(
-        dataSet.id,
-        orgUnit.id,
-        period
-    );
-
-    const result = dataElementsWithValues.map(dataElementWithValues => ({
-        dataElement: dataElementWithValues.dataElement,
-        orgUnit: dataElementWithValues.orgUnitUid,
-        period: dataElementWithValues.period,
-    }));
-
-    if (result.length === 0) console.debug("No differences found");
-    else
-        console.debug(
-            `${result.length} differences found in ${dataSet.name} for period ${period} in ${orgUnit.name} organisation unit: \n`,
-            formatDataDiffLog(result)
+    const dataElementsWithValues = await buildDataDifferenceItems({
+        dataValueRepository: dataValueRepository,
+        dataSetRepository: dataSetRepository,
+        dataSetId: dataSet.id,
+        orgUnitId: orgUnit.id,
+        yearOption: yearOption,
+    });
+
+    if (dataElementsWithValues.length === 0) console.debug("No differences found");
+    else console.debug(formatDataDiffLog(dataElementsWithValues, dataSet.name, orgUnit.name, yearOption));
+}
+
+async function buildDataDifferenceItems(options: {
+    dataValueRepository: DataValuesD2Repository;
+    dataSetRepository: DataSetD2Repository;
+    dataSetId: Id;
+    orgUnitId: Id;
+    yearOption?: string;
+}): Promise<DataDiffItem[]> {
+    const { dataValueRepository, dataSetRepository, dataSetId, orgUnitId, yearOption } = options;
+    const dataSetAPVD = await dataSetRepository.getByNameOrCode(dataSetApprovalName);
+    const appSettings = await new AppSettingsD2Repository().get();
+
+    // If not OU is provided, use the org. units assigned to the APVD data set
+    const assignedOrgUnitIds = dataSetAPVD.organisationUnits.map(ou => ou.id);
+
+    const periods = yearOption
+        ? [yearOption]
+        : _.range(DEFAULT_START_YEAR, DEFAULT_END_YEAR + 1).map(year => year.toString());
+
+    const dataValuesToApprove = await promiseMap(periods, async period => {
+        const dataElementsWithValues = await new WmrDiffReport(
+            dataValueRepository,
+            dataSetRepository,
+            appSettings
+        ).getDiff(
+            dataSetId,
+            orgUnitId,
+            period,
+            true // Include children
         );
+
+        return dataElementsWithValues
+            .filter(dv => assignedOrgUnitIds.includes(dv.orgUnitUid))
+            .map(dataElementWithValues => ({
+                orgUnit: dataElementWithValues.orgUnitUid,
+                period: dataElementWithValues.period,
+                dataElement: dataElementWithValues.dataElement ?? "",
+            }));
+    });
+
+    return _(dataValuesToApprove).flatten().value();
 }
 
 async function getMalWMRMetadata(api: D2Api, ouOption?: string): Promise<{ dataSet: CodedRef; orgUnit: CodedRef }> {
@@ -65,7 +103,7 @@ async function getMalWMRMetadata(api: D2Api, ouOption?: string): Promise<{ dataS
         getMetadataByIdentifiableToken({
             api: api,
             metadataType: "organisationUnits",
-            token: ouOption ?? ANGOLA_ORG_UNIT_NAME,
+            token: ouOption ?? GLOBAL_OU,
         }),
     ]);
 
@@ -92,13 +130,12 @@ async function main() {
     parser.add_argument("-ou", "--org-unit", {
         help: "Organisation unit identifier",
         metavar: "ORG_UNIT",
-        default: ANGOLA_ORG_UNIT_NAME,
+        default: GLOBAL_OU,
     });
 
     parser.add_argument("-y", "--year", {
         help: "Year to check differences for",
         metavar: "YEAR",
-        default: YEAR,
     });
 
     try {
@@ -115,13 +152,23 @@ async function main() {
     }
 }
 
-function formatDataDiffLog(dataDiffItems: DataDiffItem[]): string {
-    return dataDiffItems
+function formatDataDiffLog(
+    dataDiffItems: DataDiffItem[],
+    dataSetName: string,
+    orgUnitName: string,
+    yearOption?: string
+): string {
+    const logTitle = `${dataDiffItems.length} differences found in ${dataSetName} for ${
+        yearOption ? `period ${yearOption}` : `periods ${DEFAULT_START_YEAR} to ${DEFAULT_END_YEAR}`
+    } in ${orgUnitName} organisation unit: \n`;
+    const dataDiffList = dataDiffItems
         .map(
             (item, index) =>
                 `${index + 1}. Data element: ${item.dataElement}, Org Unit: ${item.orgUnit}, Period: ${item.period}`
         )
         .join("\n");
+
+    return logTitle + dataDiffList;
 }
 
 main();
diff --git a/src/utils/promises.ts b/src/utils/promises.ts
index e4934c09..7fd8c816 100644
--- a/src/utils/promises.ts
+++ b/src/utils/promises.ts
@@ -1,3 +1,5 @@
+import _ from "lodash";
+
 /* Map sequentially over T[] with an asynchronous function and return array of mapped values */
 export function promiseMap<T, S>(inputValues: T[], mapper: (value: T) => Promise<S>): Promise<S[]> {
     const reducer = (acc$: Promise<S[]>, inputValue: T): Promise<S[]> =>
@@ -10,6 +12,29 @@ export function promiseMap<T, S>(inputValues: T[], mapper: (value: T) => Promise
     return inputValues.reduce(reducer, Promise.resolve([]));
 }
 
+export async function getInChunks<T, U>(ids: T[], getter: (idsGroup: T[]) => Promise<U[]>): Promise<U[]> {
+    const objsCollection = await promiseMap(_.chunk(ids, 500), idsGroup => getter(idsGroup));
+    return _.flatten(objsCollection);
+}
+
+export async function promiseMapConcurrent<T, S>(
+    inputValues: T[],
+    mapper: (value: T) => Promise<S>,
+    concurrency = 5
+): Promise<S[]> {
+    const chunks = _.chunk(inputValues, concurrency);
+
+    const processChunk = (batch: T[]) => Promise.all(batch.map(value => mapper(value)));
+
+    const results = await chunks.reduce<Promise<S[]>>(async (accPromise, batch) => {
+        const acc = await accPromise;
+        const batchResults = await processChunk(batch);
+        return [...acc, ...batchResults];
+    }, Promise.resolve([]));
+
+    return results;
+}
+
 export const wait = (ms: number) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };
diff --git a/src/webapp/components/dropdown/MultipleDropdown.tsx b/src/webapp/components/dropdown/MultipleDropdown.tsx
index b4c1991f..0eb8e665 100644
--- a/src/webapp/components/dropdown/MultipleDropdown.tsx
+++ b/src/webapp/components/dropdown/MultipleDropdown.tsx
@@ -36,7 +36,7 @@ const MultipleDropdown: React.FC<MultipleDropdownProps> = props => {
                 onChange={notifyChange}
                 MenuProps={menuPropsBottomLeft}
             >
-                {!hideEmpty && <MenuItem value={""}>{i18n.t("- All -")}</MenuItem>}
+                {!hideEmpty && <MenuItem value={""}>{i18n.t("- No Value -")}</MenuItem>}
                 {items.map(item => (
                     <MenuItem key={item.value} value={item.value}>
                         {item.text}
diff --git a/src/webapp/reports/Reports.tsx b/src/webapp/reports/Reports.tsx
index 36fc602f..0700ed90 100644
--- a/src/webapp/reports/Reports.tsx
+++ b/src/webapp/reports/Reports.tsx
@@ -1,103 +1,8 @@
 import React from "react";
-import { AdminReport } from "./admin/AdminReport";
-import DataQualityReport from "./data-quality/DataQualityReport";
 import MalDataApprovalStatusReport from "./mal-data-approval/MalDataApprovalReport";
-import MalDataSubscriptionStatusReport from "./mal-data-subscription/MalDataSubscriptionReport";
-import { NHWADataApprovalStatusReport } from "./nhwa-approval-status/NHWADataApprovalStatusReport";
-import { NHWACommentsReport } from "./nhwa-comments/NHWACommentsReport";
-import { WMRNationalPolicies } from "./wmr-national-policies/WMRNationalPolicies";
-import CSYAuditEmergencyReport from "./csy-audit-emergency/CSYAuditEmergencyReport";
-import GLASSDataSubmissionReport from "./glass-data-submission/GLASSDataSubmissionReport";
-import CSYSummaryReport from "./csy-summary-patient/CSYSummaryReport";
-import CSYSummaryReportMortality from "./csy-summary-mortality/CSYSummaryReport";
-import CSYAuditTraumaReport from "./csy-audit-trauma/CSYAuditTraumaReport";
-import { NHWAAutoCompleteCompute } from "./nhwa-auto-complete-compute/NHWAAutoCompleteCompute";
-import { NHWAFixTotals } from "./nhwa-fix-totals-activity-level/NHWAFixTotals";
-import { NHWASubnationalCorrectOrgUnit } from "./nhwa-subnational-correct-orgunit/NHWASubnationalCorrectOrgUnit";
-import AuthoritiesMonitoringReport from "./authorities-monitoring/AuthoritiesMonitoringReport";
-import GLASSAdminReport from "./glass-admin/GLASSAdminReport";
-import { TwoFactorMonitoringReport } from "./two-factor-monitor/TwoFactorMonitoringReport";
-import i18n from "../../locales";
-
-const widget = process.env.REACT_APP_REPORT_VARIANT || "";
 
 const Component: React.FC = () => {
-    switch (widget) {
-        case "nhwa-comments": {
-            return <NHWACommentsReport />;
-        }
-        case "nhwa-approval-status": {
-            return <NHWADataApprovalStatusReport />;
-        }
-        case "mal-approval-status": {
-            return <MalDataApprovalStatusReport />;
-        }
-        case "mal-subscription-status": {
-            return <MalDataSubscriptionStatusReport />;
-        }
-        case "admin": {
-            return <AdminReport />;
-        }
-        case "wmr-national-policies": {
-            return <WMRNationalPolicies />;
-        }
-        case "csy-audit-emergency": {
-            return <CSYAuditEmergencyReport />;
-        }
-        case "csy-audit-trauma": {
-            return <CSYAuditTraumaReport />;
-        }
-        case "csy-summary-patient": {
-            return <CSYSummaryReport />;
-        }
-        case "csy-summary-mortality": {
-            return <CSYSummaryReportMortality />;
-        }
-        case "glass-submission": {
-            return <GLASSDataSubmissionReport />;
-        }
-        case "glass-admin": {
-            return <GLASSAdminReport />;
-        }
-        case "data-quality": {
-            return <DataQualityReport />;
-        }
-        case "nhwa-auto-complete-compute": {
-            return (
-                <NHWAAutoCompleteCompute
-                    countryLevel="3"
-                    settingsKey="nhwa-auto-complete-compute"
-                    title={i18n.t("Module 1 totals with missing sum or sum that does not match the auto-calculated")}
-                />
-            );
-        }
-        case "nhwa-fix-totals-activity-level": {
-            return <NHWAFixTotals />;
-        }
-        case "nhwa-subnational-correct-orgunit": {
-            return <NHWASubnationalCorrectOrgUnit />;
-        }
-        case "authorities-monitoring": {
-            return <AuthoritiesMonitoringReport />;
-        }
-        case "nhwa-auto-complete-compute-subnational": {
-            return (
-                <NHWAAutoCompleteCompute
-                    countryLevel="4"
-                    settingsKey="nhwa-subn-auto-complete-compute"
-                    title={i18n.t(
-                        "Module 1 (Subnational single entry) totals with missing sum or sum that does not match the auto-calculated"
-                    )}
-                />
-            );
-        }
-        case "two-factor-monitoring": {
-            return <TwoFactorMonitoringReport />;
-        }
-        default: {
-            return <p>{`Please provide a valid REACT_APP_REPORT_VARIANT`}</p>;
-        }
-    }
+    return <MalDataApprovalStatusReport />;
 };
 
 function Reports() {
diff --git a/src/webapp/reports/mal-data-approval/DataDifferencesList.tsx b/src/webapp/reports/mal-data-approval/DataDifferencesList.tsx
index d01d9f9c..8a3a5cc2 100644
--- a/src/webapp/reports/mal-data-approval/DataDifferencesList.tsx
+++ b/src/webapp/reports/mal-data-approval/DataDifferencesList.tsx
@@ -19,20 +19,21 @@ import { DataDiffViewModel, getDataDiffViews } from "./DataDiffViewModel";
 import { ThumbUp } from "@material-ui/icons";
 import { parseDataDuplicationItemId } from "../../../domain/reports/mal-data-approval/entities/MalDataApprovalItem";
 import { emptyPage, Sorting } from "../../../domain/common/entities/PaginatedObjects";
-import { useDataApprovalPermissions } from "./data-approval-list/hooks/useDataApprovalPermissions";
 
 interface DataDifferencesListProps {
     selectedIds: string[];
     revoke: boolean;
     isUpdated: () => void;
+    dataSetId: string;
 }
 
-export const DataDifferencesList: React.FC<DataDifferencesListProps> = ({ selectedIds, revoke, isUpdated }) => {
+export const DataDifferencesList: React.FC<DataDifferencesListProps> = ({ selectedIds, isUpdated }) => {
     const { compositionRoot, config } = useAppContext();
+    const { currentUser } = config;
     const loading = useLoading();
     const [visibleColumns, setVisibleColumns] = useState<string[]>();
     const snackbar = useSnackbar();
-    const { isMalAdmin } = useDataApprovalPermissions();
+    const dataSetId = React.useMemo(() => _(selectedIds[0]).split("-").first() ?? "", [selectedIds]);
 
     const baseConfig: TableConfig<DataDiffViewModel> = useMemo(
         () => ({
@@ -54,13 +55,20 @@ export const DataDifferencesList: React.FC<DataDifferencesListProps> = ({ select
                         const items = _.compact(selectedIds.map(item => parseDataDiffItemId(item)));
                         if (items.length === 0) return;
 
-                        const result = await compositionRoot.malDataApproval.duplicateValue(items, revoke);
-                        loading.hide();
-                        if (!result) snackbar.error(i18n.t("Error when trying to approve data values"));
+                        try {
+                            const result = await compositionRoot.malDataApproval.duplicateValue(items);
+                            loading.hide();
+                            if (!result) snackbar.error(i18n.t("Error when trying to approve data values"));
+                        } catch (error: any) {
+                            snackbar.error(error.message);
+                        }
 
                         isUpdated();
                     },
-                    isActive: items => isMalAdmin && items.filter(item => item.value !== undefined).length > 0,
+                    isActive: items => {
+                        const access = currentUser.dataSets ? currentUser.dataSets[dataSetId] : undefined;
+                        return Boolean(access?.approve) && items.filter(item => item.value !== undefined).length > 0;
+                    },
                 },
             ],
             initialSorting: {
@@ -72,7 +80,7 @@ export const DataDifferencesList: React.FC<DataDifferencesListProps> = ({ select
                 pageSizeInitialValue: 10,
             },
         }),
-        [compositionRoot.malDataApproval, isMalAdmin, isUpdated, revoke, snackbar, loading]
+        [compositionRoot.malDataApproval, isUpdated, currentUser, snackbar, loading, dataSetId]
     );
 
     const getRows = useMemo(
@@ -86,7 +94,7 @@ export const DataDifferencesList: React.FC<DataDifferencesListProps> = ({ select
                 sorting: getSortingFromTableSorting(sorting),
                 periods: items.map(item => item.period),
                 orgUnitIds: items.map(item => item.orgUnit),
-                dataSetId: items[0]?.dataSet,
+                dataSetId: items[0]?.dataSet ?? "",
             });
 
             if (!pager && !objects) {
diff --git a/src/webapp/reports/mal-data-approval/MalDataApprovalReport.tsx b/src/webapp/reports/mal-data-approval/MalDataApprovalReport.tsx
index 3d80e638..3d222639 100644
--- a/src/webapp/reports/mal-data-approval/MalDataApprovalReport.tsx
+++ b/src/webapp/reports/mal-data-approval/MalDataApprovalReport.tsx
@@ -8,7 +8,7 @@ const MalDataApprovalStatusReport: React.FC = () => {
     return (
         <div className={classes.wrapper}>
             <Typography variant="h5" gutterBottom>
-                {i18n.t("Malaria Data Approval Report")}
+                {i18n.t("Data Approval Report")}
             </Typography>
 
             <DataApprovalList />
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/DataApprovalList.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/DataApprovalList.tsx
index 20c2c5b6..075ceee2 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/DataApprovalList.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/DataApprovalList.tsx
@@ -3,9 +3,7 @@ import {
     TableColumn,
     TableConfig,
     TableGlobalAction,
-    TablePagination,
     TableSorting,
-    useObjectsTable,
     useSnackbar,
 } from "@eyeseetea/d2-ui-components";
 import ClearAllIcon from "@material-ui/icons/ClearAll";
@@ -26,7 +24,7 @@ import { ConfirmationDialog } from "@eyeseetea/d2-ui-components";
 import { DataApprovalViewModel, getDataApprovalViews } from "../DataApprovalViewModel";
 import { DataSetsFilter, Filters } from "./Filters";
 import { DataDifferencesList } from "../DataDifferencesList";
-import { Notifications, NotificationsOff, PlaylistAddCheck, ThumbUp } from "@material-ui/icons";
+import { PlaylistAddCheck, ThumbUp } from "@material-ui/icons";
 import { Namespaces } from "../../../../data/common/clients/storage/Namespaces";
 import { emptyApprovalFilter } from "./hooks/useDataApprovalFilters";
 import { useDataApprovalListColumns } from "./hooks/useDataApprovalListColumns";
@@ -34,6 +32,11 @@ import { useActiveDataApprovalActions } from "./hooks/useActiveDataApprovalActio
 import { useDataApprovalActions } from "./hooks/useDataApprovalActions";
 import { useSelectablePeriods } from "./hooks/useSelectablePeriods";
 
+const defaultSorting: TableSorting<DataApprovalViewModel> = {
+    field: "dataSet",
+    order: "asc",
+};
+
 export const DataApprovalList: React.FC = React.memo(() => {
     const { compositionRoot, config } = useAppContext();
     const snackbar = useSnackbar();
@@ -41,6 +44,10 @@ export const DataApprovalList: React.FC = React.memo(() => {
     const [visibleColumns, setVisibleColumns] = useState<string[]>();
     const [__, setDiffState] = useState<string>("");
     const [oldPeriods, setOldPeriods] = useState(false);
+    const [isLoading, setIsLoading] = React.useState(false);
+    const [page] = React.useState(1);
+    const [pageSize] = React.useState(50);
+    const [rows, setRows] = React.useState<DataApprovalViewModel[]>([]);
 
     const activeActions = useActiveDataApprovalActions();
     const {
@@ -64,9 +71,9 @@ export const DataApprovalList: React.FC = React.memo(() => {
         });
     }, [compositionRoot]);
 
-    useEffect(() => {
-        if (filters.dataSetId) compositionRoot.malDataApproval.saveMalDiffNames(filters.dataSetId);
-    }, [compositionRoot, filters.dataSetId]);
+    // useEffect(() => {
+    //     if (filters.dataSetId) compositionRoot.malDataApproval.saveMalDiffNames(filters.dataSetId);
+    // }, [compositionRoot, filters.dataSetId]);
 
     const baseConfig: TableConfig<DataApprovalViewModel> = useMemo(
         () => ({
@@ -112,22 +119,6 @@ export const DataApprovalList: React.FC = React.memo(() => {
                     onClick: onTableActionClick.approveAction,
                     isActive: activeActions.isApproveActionVisible,
                 },
-                {
-                    name: "activate",
-                    text: i18n.t("Activate monitoring"),
-                    icon: <Notifications />,
-                    multiple: true,
-                    onClick: onTableActionClick.activateMonitoringAction,
-                    isActive: activeActions.isActivateMonitoringActionVisible,
-                },
-                {
-                    name: "deactivate",
-                    text: i18n.t("Deactivate monitoring"),
-                    icon: <NotificationsOff />,
-                    multiple: true,
-                    onClick: onTableActionClick.deactivateMonitoringAction,
-                    isActive: activeActions.isDeactivateMonitoringActionVisible,
-                },
                 {
                     name: "getDiff",
                     text: i18n.t("Check Difference"),
@@ -135,16 +126,9 @@ export const DataApprovalList: React.FC = React.memo(() => {
                     onClick: onTableActionClick.getDifferenceAction,
                     isActive: activeActions.isGetDifferenceActionVisible,
                 },
-                {
-                    name: "getDiffAndRevoke",
-                    text: i18n.t("Check Difference"),
-                    icon: <PlaylistAddCheck />,
-                    onClick: onTableActionClick.getDifferenceAndRevokeAction,
-                    isActive: activeActions.isGetDifferenceAndRevokeActionVisible,
-                },
             ],
             initialSorting: {
-                field: "orgUnit" as const,
+                field: "dataSet" as const,
                 order: "asc" as const,
             },
             paginationOptions: {
@@ -159,37 +143,47 @@ export const DataApprovalList: React.FC = React.memo(() => {
             onTableActionClick.submitAction,
             onTableActionClick.revokeAction,
             onTableActionClick.approveAction,
-            onTableActionClick.activateMonitoringAction,
-            onTableActionClick.deactivateMonitoringAction,
             onTableActionClick.getDifferenceAction,
-            onTableActionClick.getDifferenceAndRevokeAction,
             activeActions.isCompleteActionVisible,
             activeActions.isIncompleteActionVisible,
             activeActions.isSubmitActionVisible,
             activeActions.isRevokeActionVisible,
             activeActions.isApproveActionVisible,
-            activeActions.isActivateMonitoringActionVisible,
-            activeActions.isDeactivateMonitoringActionVisible,
             activeActions.isGetDifferenceActionVisible,
-            activeActions.isGetDifferenceAndRevokeActionVisible,
         ]
     );
 
-    const getRows = useCallback(
-        async (_search: string, paging: TablePagination, sorting: TableSorting<DataApprovalViewModel>) => {
-            const { pager, objects } = await compositionRoot.malDataApproval.get(Namespaces.MONITORING, {
-                config: config,
-                paging: { page: paging.page, pageSize: paging.pageSize },
-                sorting: getSortingFromTableSorting(sorting),
-                useOldPeriods: oldPeriods,
-                ...getUseCaseOptions(filters, selectablePeriods),
-            });
+    React.useEffect(() => {
+        let isCancelled = false;
+        async function getData() {
+            setIsLoading(true);
+            try {
+                const { objects } = await compositionRoot.malDataApproval.get(Namespaces.MONITORING, {
+                    config: config,
+                    paging: { page: 1, pageSize: 1000 },
+                    sorting: getSortingFromTableSorting(defaultSorting),
+                    useOldPeriods: oldPeriods,
+                    ...getUseCaseOptions(filters, selectablePeriods),
+                });
 
-            console.debug("Reloading", reloadKey);
-            return { pager, objects: getDataApprovalViews(objects) };
-        },
-        [compositionRoot.malDataApproval, config, oldPeriods, filters, selectablePeriods, reloadKey]
-    );
+                if (isCancelled) return;
+
+                console.debug("Reloading", reloadKey);
+                setRows(getDataApprovalViews(objects));
+                setIsLoading(false);
+            } finally {
+                if (!isCancelled) {
+                    setIsLoading(false);
+                }
+            }
+        }
+
+        getData();
+
+        return () => {
+            isCancelled = true;
+        };
+    }, [compositionRoot.malDataApproval, config, oldPeriods, filters, selectablePeriods, reloadKey]);
 
     const saveReorderedColumns = useCallback(
         async (columnKeys: Array<keyof DataApprovalViewModel>) => {
@@ -200,21 +194,19 @@ export const DataApprovalList: React.FC = React.memo(() => {
         [compositionRoot, visibleColumns]
     );
 
-    const tableProps = useObjectsTable(baseConfig, getRows);
-
     const columnsToShow = useMemo<TableColumn<DataApprovalViewModel>[]>(() => {
-        if (!visibleColumns || _.isEmpty(visibleColumns)) return tableProps.columns;
+        if (!visibleColumns || _.isEmpty(visibleColumns)) return baseConfig.columns;
 
         const indexes = _(visibleColumns)
             .map((columnName, idx) => [columnName, idx] as [string, number])
             .fromPairs()
             .value();
 
-        return _(tableProps.columns)
+        return _(baseConfig.columns)
             .map(column => ({ ...column, hidden: !visibleColumns.includes(column.name) }))
             .sortBy(column => indexes[column.name] || 0)
             .value();
-    }, [tableProps.columns, visibleColumns]);
+    }, [baseConfig.columns, visibleColumns]);
 
     const filterOptions = useMemo(() => getFilterOptions(config, selectablePeriods), [config, selectablePeriods]);
 
@@ -231,11 +223,17 @@ export const DataApprovalList: React.FC = React.memo(() => {
     return (
         <React.Fragment>
             <ObjectsList<DataApprovalViewModel>
-                {...tableProps}
+                {...baseConfig}
                 globalActions={[periodsToggle]}
                 columns={columnsToShow}
                 onChangeSearch={undefined}
                 onReorderColumns={saveReorderedColumns}
+                reload={console.debug}
+                isLoading={isLoading}
+                onChange={console.debug}
+                pagination={{ page: page, pageSize: pageSize, total: rows.length }}
+                searchBoxLabel=""
+                rows={isLoading ? [] : rows}
             >
                 <Filters
                     hideDataSets={false} // perhaps show datasets based on user permissions?
@@ -254,6 +252,7 @@ export const DataApprovalList: React.FC = React.memo(() => {
             >
                 <DataDifferencesList
                     selectedIds={selectedIds}
+                    dataSetId={filters.dataSetIds[0] ?? ""}
                     revoke={revoke}
                     isUpdated={() => setDiffState(`${new Date().getTime()}`)}
                     key={new Date().getTime()}
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/Filters.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/Filters.tsx
index 9ce35c62..2e045287 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/Filters.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/Filters.tsx
@@ -17,11 +17,13 @@ type DataSetsFiltersProps = {
 };
 
 export interface DataSetsFilter {
-    dataSetId: Id | undefined;
+    dataSetIds: Id[];
     orgUnitPaths: Id[];
     periods: string[];
     completionStatus?: boolean;
     approvalStatus?: boolean;
+    isApproved?: boolean;
+    modificationCount?: string | undefined;
 }
 
 interface FilterOptions {
@@ -35,7 +37,6 @@ export const Filters: React.FC<DataSetsFiltersProps> = React.memo(props => {
 
     const { filterValues, rootIds, selectableIds, setFilterValues, applyFilters, clearFilters } =
         useDataApprovalFilters(props);
-    useDataApprovalFilters(props);
 
     const dataSetItems = useMemoOptionsFromNamedRef(filterOptions.dataSets);
     const periodItems = useMemoOptionsFromStrings(filterOptions.periods);
@@ -54,15 +55,30 @@ export const Filters: React.FC<DataSetsFiltersProps> = React.memo(props => {
         ];
     }, []);
 
+    const approvedFilterItems = useMemo(() => {
+        return [
+            { value: "true", text: i18n.t("Approved") },
+            { value: "false", text: i18n.t("Not Approved") },
+        ];
+    }, []);
+
+    const countItems = useMemo(() => {
+        return [
+            { value: "0", text: i18n.t("0") },
+            { value: "1", text: i18n.t("Greater than 0") },
+        ];
+    }, []);
+
     return (
         <>
             <Container>
                 {!hideDataSets && (
                     <DataSetDropdown
                         items={dataSetItems}
-                        value={filterValues.dataSetId}
+                        values={filterValues.dataSetIds}
                         onChange={setFilterValues.dataSetId}
                         label={i18n.t("Data sets")}
+                        hideEmpty
                     />
                 )}
 
@@ -95,10 +111,24 @@ export const Filters: React.FC<DataSetsFiltersProps> = React.memo(props => {
                     onChange={setFilterValues.approvalStatus}
                     label={i18n.t("Submission status")}
                 />
+
+                <SingleDropdownStyled
+                    items={approvedFilterItems}
+                    value={fromBool(filterValues.isApproved)}
+                    onChange={setFilterValues.approvedStatus}
+                    label={i18n.t("Approval status")}
+                />
+
+                <SingleDropdownStyled
+                    items={countItems}
+                    value={filterValues.modificationCount}
+                    onChange={setFilterValues.updateModificationCount}
+                    label={i18n.t("Modification Count")}
+                />
             </Container>
 
             <FilterButtonContainer>
-                <Button disabled={!filterValues.dataSetId} onClick={applyFilters} variant="contained" color="primary">
+                <Button onClick={applyFilters} variant="contained" color="primary">
                     {i18n.t("Apply filters")}
                 </Button>
 
@@ -137,7 +167,7 @@ const SingleDropdownStyled = styled(Dropdown)`
     width: 180px;
 `;
 
-const DataSetDropdown = styled(Dropdown)`
+const DataSetDropdown = styled(MultipleDropdown)`
     margin-left: -10px;
     width: 260px;
 `;
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useActiveDataApprovalActions.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useActiveDataApprovalActions.tsx
index 94c7b58f..be7f7e22 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useActiveDataApprovalActions.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useActiveDataApprovalActions.tsx
@@ -2,6 +2,9 @@ import { useCallback } from "react";
 import _ from "lodash";
 import { DataApprovalViewModel } from "../../DataApprovalViewModel";
 import { useDataApprovalPermissions } from "./useDataApprovalPermissions";
+import { Id } from "../../../../../domain/common/entities/Base";
+import { useAppContext } from "../../../../contexts/app-context";
+import { Config } from "../../../../../domain/common/entities/Config";
 
 type ActiveDataApprovalActionsState = {
     isActivateMonitoringActionVisible: (rows: DataApprovalViewModel[]) => boolean;
@@ -15,56 +18,98 @@ type ActiveDataApprovalActionsState = {
     isSubmitActionVisible: (rows: DataApprovalViewModel[]) => boolean;
 };
 
+function getDataSetAccess(config: Config, dataSetId: Id) {
+    const access = config.currentUser.dataSets ? config.currentUser.dataSets[dataSetId] : undefined;
+    return access;
+}
+
 export function useActiveDataApprovalActions(): ActiveDataApprovalActionsState {
-    const { isMalAdmin, isMalCountryApprover } = useDataApprovalPermissions();
+    const { config } = useAppContext();
+    const { isMalAdmin } = useDataApprovalPermissions();
 
     const isActivateMonitoringActionVisible = useCallback(
-        (rows: DataApprovalViewModel[]) => _.every(rows, row => !row.monitoring) && isMalAdmin,
-        [isMalAdmin]
+        (rows: DataApprovalViewModel[]) => {
+            return _(rows).every(row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return !row.monitoring && Boolean(isMalAdmin || access?.monitoring);
+            });
+        },
+        [isMalAdmin, config]
     );
 
     const isApproveActionVisible = useCallback(
-        (rows: DataApprovalViewModel[]) => _.every(rows, row => row.lastUpdatedValue) && isMalAdmin,
-        [isMalAdmin]
+        (rows: DataApprovalViewModel[]) => {
+            return _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return (
+                    row.lastUpdatedValue && Number(row.modificationCount) > 0 && Boolean(isMalAdmin || access?.approve)
+                );
+            });
+        },
+        [isMalAdmin, config]
     );
 
     const isCompleteActionVisible = useCallback(
         (rows: DataApprovalViewModel[]) =>
-            _.every(rows, row => !row.completed && row.lastUpdatedValue) && (isMalCountryApprover || isMalAdmin),
-        [isMalAdmin, isMalCountryApprover]
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return !row.completed && row.lastUpdatedValue && Boolean(isMalAdmin || access?.complete);
+            }),
+        [isMalAdmin, config]
     );
 
     const isDeactivateMonitoringActionVisible = useCallback(
-        (rows: DataApprovalViewModel[]) => _.every(rows, row => row.monitoring) && isMalAdmin,
-        [isMalAdmin]
+        (rows: DataApprovalViewModel[]) =>
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return row.monitoring && Boolean(isMalAdmin || access?.monitoring);
+            }),
+        [isMalAdmin, config]
     );
 
     const isGetDifferenceActionVisible = useCallback(
         (rows: DataApprovalViewModel[]) =>
-            _.every(rows, row => row.lastUpdatedValue && !row.validated) && (isMalCountryApprover || isMalAdmin),
-        [isMalAdmin, isMalCountryApprover]
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return row.lastUpdatedValue && Number(row.modificationCount) > 0 && Boolean(access?.read || isMalAdmin);
+            }),
+        [isMalAdmin, config]
     );
 
     const isGetDifferenceAndRevokeActionVisible = useCallback(
         (rows: DataApprovalViewModel[]) =>
-            _.every(rows, row => row.lastUpdatedValue && row.validated) && (isMalCountryApprover || isMalAdmin),
-        [isMalAdmin, isMalCountryApprover]
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return row.lastUpdatedValue && row.validated && Boolean(access?.read || isMalAdmin);
+            }),
+        [isMalAdmin, config]
     );
 
     const isIncompleteActionVisible = useCallback(
-        (rows: DataApprovalViewModel[]) => _.every(rows, row => row.completed && !row.validated),
-        []
+        (rows: DataApprovalViewModel[]) =>
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return row.completed && !row.validated && Boolean(isMalAdmin || access?.incomplete);
+            }),
+        [isMalAdmin, config]
     );
 
     const isSubmitActionVisible = useCallback(
         (rows: DataApprovalViewModel[]) =>
-            _.every(rows, row => !row.approved && row.lastUpdatedValue) && (isMalCountryApprover || isMalAdmin),
-        [isMalAdmin, isMalCountryApprover]
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return !row.approved && row.lastUpdatedValue && Boolean(access?.submit || isMalAdmin);
+            }),
+        [isMalAdmin, config]
     );
 
     const isRevokeActionVisible = useCallback(
-        (rows: DataApprovalViewModel[]) => _.every(rows, row => row.approved),
-        []
+        (rows: DataApprovalViewModel[]) =>
+            _.every(rows, row => {
+                const access = getDataSetAccess(config, row.dataSetUid);
+                return row.approved && Boolean(isMalAdmin || access?.revoke);
+            }),
+        [isMalAdmin, config]
     );
 
     return {
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalActions.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalActions.tsx
index d6886a29..d4fa22a6 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalActions.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalActions.tsx
@@ -6,6 +6,7 @@ import { useReload } from "../../../../utils/use-reload";
 import { useAppContext } from "../../../../contexts/app-context";
 import { useDataApprovalMonitoring } from "./useDataApprovalMonitoring";
 import { useBooleanState } from "../../../../utils/use-boolean";
+import { useLoading } from "@eyeseetea/d2-ui-components";
 
 type GlobalMessage = {
     type: "success" | "error";
@@ -41,6 +42,7 @@ type DataApprovalActionsState = {
 export function useDataApprovalActions(): DataApprovalActionsState {
     const { compositionRoot } = useAppContext();
     const [reloadKey, reload] = useReload();
+    const loading = useLoading();
     const { saveMonitoring: saveMonitoringValue } = useDataApprovalMonitoring();
 
     const [globalMessage, setGlobalMessage] = useState<GlobalMessage>();
@@ -64,31 +66,34 @@ export function useDataApprovalActions(): DataApprovalActionsState {
             const items = _.compact(selectedIds.map(item => parseDataDuplicationItemId(item)));
             if (items.length === 0) return;
 
+            loading.show(true, "Approving dataset");
             const result = await compositionRoot.malDataApproval.updateStatus(items, "duplicate");
             if (!result) setGlobalMessage({ type: "error", message: i18n.t("Error when trying to approve data set") });
 
             saveMonitoringValue(items, true);
             reload();
+            loading.hide();
         },
-        [compositionRoot.malDataApproval, reload, saveMonitoringValue]
+        [compositionRoot.malDataApproval, reload, saveMonitoringValue, loading]
     );
 
     const updateCompletionStatus = useCallback(
-        async (selectedIds: string[], status: CompletionStatus) => {
+        async (selectedIds: string[], status: CompletionStatus, loadingText: string) => {
             const items = _.compact(selectedIds.map(item => parseDataDuplicationItemId(item)));
             if (items.length === 0) return;
-
+            loading.show(true, loadingText);
             const result = await compositionRoot.malDataApproval.updateStatus(items, status);
             if (!result)
                 setGlobalMessage({ type: "error", message: i18n.t(`Error when trying to ${status} data set`) });
 
             reload();
+            loading.hide();
         },
-        [compositionRoot.malDataApproval, reload]
+        [compositionRoot.malDataApproval, reload, loading]
     );
 
     const completeAction = useCallback(
-        async (selectedIds: string[]) => updateCompletionStatus(selectedIds, "complete"),
+        async (selectedIds: string[]) => updateCompletionStatus(selectedIds, "complete", i18n.t("Completing dataset")),
         [updateCompletionStatus]
     );
 
@@ -122,7 +127,8 @@ export function useDataApprovalActions(): DataApprovalActionsState {
     );
 
     const incompleteAction = useCallback(
-        async (selectedIds: string[]) => updateCompletionStatus(selectedIds, "incomplete"),
+        async (selectedIds: string[]) =>
+            updateCompletionStatus(selectedIds, "incomplete", i18n.t("Updating status to incomplete")),
         [updateCompletionStatus]
     );
 
@@ -130,26 +136,28 @@ export function useDataApprovalActions(): DataApprovalActionsState {
         async (selectedIds: string[]) => {
             const items = _.compact(selectedIds.map(item => parseDataDuplicationItemId(item)));
             if (items.length === 0) return;
-
+            loading.show(true, i18n.t("Revoking dataset"));
             const result = await compositionRoot.malDataApproval.updateStatus(items, "revoke");
             if (!result) setGlobalMessage({ type: "error", message: i18n.t("Error when trying to unsubmit data set") });
 
             reload();
+            loading.hide();
         },
-        [compositionRoot.malDataApproval, reload]
+        [compositionRoot.malDataApproval, reload, loading]
     );
 
     const submitAction = useCallback(
         async (selectedIds: string[]) => {
             const items = _.compact(selectedIds.map(item => parseDataDuplicationItemId(item)));
             if (items.length === 0) return;
-
+            loading.show(true, i18n.t("Submitting dataset"));
             const result = await compositionRoot.malDataApproval.updateStatus(items, "approve");
             if (!result) setGlobalMessage({ type: "error", message: i18n.t("Error when trying to submit data set") });
 
             reload();
+            loading.hide();
         },
-        [compositionRoot.malDataApproval, reload]
+        [compositionRoot.malDataApproval, reload, loading]
     );
 
     const closeDataDifferencesDialog = useCallback(() => {
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalFilters.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalFilters.tsx
index 6f88e52c..e04d1db9 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalFilters.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalFilters.tsx
@@ -19,20 +19,23 @@ type DataApprovalFilterState = {
     applyFilters: () => void;
     clearFilters: () => void;
     setFilterValues: {
-        dataSetId: SingleDropdownHandler;
+        dataSetId: DropdownHandler;
         orgUnitPaths: OrgUnitsFilterButtonProps["setSelected"];
         periods: DropdownHandler;
         completionStatus: SingleDropdownHandler;
         approvalStatus: SingleDropdownHandler;
+        approvedStatus: SingleDropdownHandler;
+        updateModificationCount: SingleDropdownHandler;
     };
 };
 
 export function useDataApprovalFilters(filterProps: DataApprovalFilterProps): DataApprovalFilterState {
     const { config, compositionRoot } = useAppContext();
+    const initialDataSetIds = Object.keys(config.dataSets);
     const { values: filter, onChange } = filterProps;
     const { orgUnitPaths } = filter;
 
-    const [filterValues, setFilterValues] = useState(emptyApprovalFilter);
+    const [filterValues, setFilterValues] = useState({ ...emptyApprovalFilter, dataSetIds: initialDataSetIds });
     const [orgUnits, setOrgUnits] = useState<OrgUnitWithChildren[]>([]);
 
     useEffect(() => {
@@ -79,8 +82,8 @@ export function useDataApprovalFilters(filterProps: DataApprovalFilterProps): Da
         [orgUnitPaths, orgUnitsByPath]
     );
 
-    const setDataSetId = useCallback<SingleDropdownHandler>(
-        dataSetId => setFilterValues(prev => ({ ...prev, dataSetId: dataSetId })),
+    const setDataSetId = useCallback<DropdownHandler>(
+        dataSetId => setFilterValues(prev => ({ ...prev, dataSetIds: dataSetId })),
         [setFilterValues]
     );
 
@@ -99,8 +102,18 @@ export function useDataApprovalFilters(filterProps: DataApprovalFilterProps): Da
         [setFilterValues]
     );
 
+    const setApprovedStatus = useCallback<SingleDropdownHandler>(
+        approvedStatus => setFilterValues(prev => ({ ...prev, isApproved: toBool(approvedStatus) })),
+        [setFilterValues]
+    );
+
+    const setModificationCount = useCallback<SingleDropdownHandler>(
+        modificationCount => setFilterValues(prev => ({ ...prev, modificationCount: modificationCount })),
+        [setFilterValues]
+    );
+
     const applyFilters = useCallback(() => {
-        onChange(filterValues);
+        onChange({ ...filterValues });
     }, [filterValues, onChange]);
 
     const clearFilters = useCallback(() => {
@@ -120,6 +133,8 @@ export function useDataApprovalFilters(filterProps: DataApprovalFilterProps): Da
             periods: setPeriods,
             completionStatus: setCompletionStatus,
             approvalStatus: setApprovalStatus,
+            approvedStatus: setApprovedStatus,
+            updateModificationCount: setModificationCount,
         },
     };
 }
@@ -127,7 +142,7 @@ export function useDataApprovalFilters(filterProps: DataApprovalFilterProps): Da
 const countryLevel = 3;
 
 export const emptyApprovalFilter: DataSetsFilter = {
-    dataSetId: undefined,
+    dataSetIds: [],
     orgUnitPaths: [],
     periods: [],
     completionStatus: undefined,
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalListColumns.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalListColumns.tsx
index 8e5dbb77..32778354 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalListColumns.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalListColumns.tsx
@@ -13,45 +13,51 @@ export function useDataApprovalListColumns() {
                 ? format(row.lastDateOfSubmission, dateFormat)
                 : "Never submitted",
             lastUpdatedValue: row.lastUpdatedValue ? format(row.lastUpdatedValue, dateFormat) : "No data",
-            validated: row.validated ? "Submitted" : row.completed ? "Ready for submission" : "Not completed",
+            validated: row.validated ? "Submitted" : row.completed ? "Ready for submission" : "Not submitted",
         };
     }, []);
 
     const columns: TableColumn<DataApprovalViewModel>[] = useMemo(() => {
         return [
-            { name: "orgUnit", text: i18n.t("Organisation unit"), sortable: true },
-            { name: "period", text: i18n.t("Period"), sortable: true },
-            { name: "dataSet", text: i18n.t("Data set"), sortable: true, hidden: true },
-            { name: "attribute", text: i18n.t("Attribute"), sortable: true, hidden: true },
+            { name: "dataSet", text: i18n.t("Data set"), sortable: false, hidden: false },
+            { name: "orgUnit", text: i18n.t("Organisation unit"), sortable: false },
+            { name: "period", text: i18n.t("Period"), sortable: false },
+            { name: "attribute", text: i18n.t("Attribute"), sortable: false, hidden: true },
             {
                 name: "completed",
                 text: i18n.t("Completion status"),
-                sortable: true,
+                sortable: false,
                 getValue: row => getColumnValues(row).completed,
             },
             {
                 name: "validated",
                 text: i18n.t("Submission status"),
-                sortable: true,
+                sortable: false,
                 getValue: row => getColumnValues(row).validated,
             },
-            { name: "modificationCount", text: i18n.t("Modification Count"), sortable: true },
+            {
+                name: "approved",
+                text: i18n.t("Approval status"),
+                sortable: false,
+                getValue: row => (row.lastDateOfApproval ? i18n.t("Approved") : i18n.t("Not approved")),
+            },
+            { name: "modificationCount", text: i18n.t("Modification Count"), sortable: false },
             {
                 name: "lastUpdatedValue",
                 text: i18n.t("Last modification date"),
-                sortable: true,
+                sortable: false,
                 getValue: row => getColumnValues(row).lastUpdatedValue,
             },
             {
                 name: "lastDateOfSubmission",
                 text: i18n.t("Last date of submission"),
-                sortable: true,
+                sortable: false,
                 getValue: row => getColumnValues(row).lastDateOfSubmission,
             },
             {
                 name: "lastDateOfApproval",
                 text: i18n.t("Last date of approval"),
-                sortable: true,
+                sortable: false,
                 getValue: row => getColumnValues(row).lastDateOfApproval,
             },
         ];
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalMonitoring.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalMonitoring.tsx
index 0841ad86..11701042 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalMonitoring.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalMonitoring.tsx
@@ -4,7 +4,7 @@ import { Namespaces } from "../../../../../data/common/clients/storage/Namespace
 import { useAppContext } from "../../../../contexts/app-context";
 import _ from "lodash";
 import { MonitoringValue } from "../../../../../domain/reports/mal-data-approval/entities/MonitoringValue";
-import { malariaDataSets } from "../../../../../data/reports/mal-data-approval/constants/MalDataApprovalConstants";
+import { MalDataSet } from "../../../../../data/reports/mal-data-approval/constants/MalDataApprovalConstants";
 
 export function useDataApprovalMonitoring() {
     const { compositionRoot, config } = useAppContext();
@@ -19,16 +19,15 @@ export function useDataApprovalMonitoring() {
             const dataSetName = _.values(config.dataSets).find(dataSet =>
                 items.map(item => item.dataSet).includes(dataSet.id)
             )?.name;
-            const dataSetApprovalName = malariaDataSets.find(dataSet => dataSet === dataSetName);
 
             if (!monitoringValue) return;
-            if (!dataSetApprovalName) throw new Error("Data set not found");
+            if (!dataSetName) throw new Error("Data set not found");
 
             return await compositionRoot.malDataApproval.updateMonitoring({
                 namespace: Namespaces.MONITORING,
                 monitoringValue: monitoringValue,
                 dataApprovalItems: items,
-                dataSetName: dataSetApprovalName,
+                dataSetName: dataSetName as MalDataSet,
                 enableMonitoring: enableMonitoring,
             });
         },
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalPermissions.ts b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalPermissions.ts
index 4bffc9dc..03c197bf 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalPermissions.ts
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useDataApprovalPermissions.ts
@@ -1,4 +1,3 @@
-import { useMemo } from "react";
 import { useAppContext } from "../../../../contexts/app-context";
 
 type DataApprovalUserPermissionsState = {
@@ -11,17 +10,5 @@ export function useDataApprovalPermissions(): DataApprovalUserPermissionsState {
         config: { currentUser },
     } = useAppContext();
 
-    const isMalCountryApprover = useMemo(
-        () => currentUser.userGroups.map(userGroup => userGroup.name).includes("MAL_Country Approver"),
-        [currentUser.userGroups]
-    );
-    const isMalAdmin = useMemo(
-        () => currentUser.userGroups.map(userGroup => userGroup.name).includes("MAL_Malaria admin"),
-        [currentUser.userGroups]
-    );
-
-    return {
-        isMalAdmin: isMalAdmin,
-        isMalCountryApprover: isMalCountryApprover,
-    };
+    return { isMalAdmin: currentUser.isAdmin, isMalCountryApprover: currentUser.isAdmin };
 }
diff --git a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useSelectablePeriods.tsx b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useSelectablePeriods.tsx
index f04c72fe..9a0a9882 100644
--- a/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useSelectablePeriods.tsx
+++ b/src/webapp/reports/mal-data-approval/data-approval-list/hooks/useSelectablePeriods.tsx
@@ -7,7 +7,7 @@ export function useSelectablePeriods(useOldPeriods: boolean): string[] {
 
         return useOldPeriods
             ? _.range(START_YEAR, currentYear - 5).map(n => n.toString())
-            : _.range(currentYear - 5, currentYear).map(n => n.toString());
+            : _.range(currentYear - 5, currentYear + 6).map(n => n.toString());
     }, [useOldPeriods]);
 
     return selectablePeriods;