diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js
index b7b7a8f..0a12120 100644
--- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js
+++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js
@@ -25,6 +25,7 @@ function DeduplicationFieldSelectionDialog({
 }) {
   if (!benefitPlan) return null;
 
+  const [selectedValues, setSelectedValues] = useState([]);
   const [isOpen, setIsOpen] = useState(false);
 
   const handleOpen = () => {
@@ -35,6 +36,10 @@ function DeduplicationFieldSelectionDialog({
     setIsOpen(false);
   };
 
+  const handlePickerChange = (selectedOptions) => {
+    setSelectedValues(selectedOptions);
+  };
+
   return (
     <>
       <Button
@@ -69,9 +74,10 @@ function DeduplicationFieldSelectionDialog({
         <DialogContent>
           <DeduplicationFieldPicker
             required
-            value={[]}
+            value={selectedValues}
             module="deduplication"
-            onChange={() => []}
+            benefitPlan={benefitPlan}
+            onChange={handlePickerChange}
           />
         </DialogContent>
         <DialogActions
diff --git a/src/components/pickers/DeduplicationFieldPicker.js b/src/components/pickers/DeduplicationFieldPicker.js
index b674052..39753ba 100644
--- a/src/components/pickers/DeduplicationFieldPicker.js
+++ b/src/components/pickers/DeduplicationFieldPicker.js
@@ -1,8 +1,10 @@
 import React, { useState } from 'react';
-import { useGraphqlQuery, useTranslations, Autocomplete } from '@openimis/fe-core';
+import { useTranslations, Autocomplete } from '@openimis/fe-core';
+import { BASIC_FIELDS } from '../../constants';
 
 function DeduplicationFieldPicker({
   readOnly,
+  benefitPlan,
   value,
   onChange,
   required,
@@ -17,14 +19,10 @@ function DeduplicationFieldPicker({
   const [searchString, setSearchString] = useState();
   const { formatMessage } = useTranslations('deduplication');
 
-  const { isLoading, data, error } = useGraphqlQuery(
-    `
-  `,
-    { str: searchString },
-  );
-
-  const roles = data?.role?.edges.map((edge) => edge.node) ?? [];
-  const uniqueValues = [...new Map(value?.map((role) => [role.id, role])).values()];
+  const beneficiaryDataSchema = JSON.parse(benefitPlan?.beneficiaryDataSchema);
+  const schemaFields = Object.keys(beneficiaryDataSchema?.properties ?? {});
+  const schemaFieldsList = schemaFields.map((key) => ({ id: key, name: key }));
+  const possibleFields = [...schemaFieldsList, ...BASIC_FIELDS];
 
   return (
     <Autocomplete
@@ -32,13 +30,13 @@ function DeduplicationFieldPicker({
       required={required}
       placeholder={placeholder ?? formatMessage('deduplication.deduplicate.fields.placeholder')}
       label={label ?? formatMessage('deduplication.deduplicate.fields')}
-      error={error}
+      error={[]}
       withLabel={withLabel}
       withPlaceholder={withPlaceholder}
       readOnly={readOnly}
-      options={roles}
-      isLoading={isLoading}
-      value={uniqueValues}
+      options={possibleFields}
+      isLoading={false}
+      value={value}
       getOptionLabel={(o) => o?.name}
       onChange={(option) => onChange(option, option?.name)}
       filterOptions={filterOptions}
diff --git a/src/constants.js b/src/constants.js
new file mode 100644
index 0000000..699e432
--- /dev/null
+++ b/src/constants.js
@@ -0,0 +1,6 @@
+export const BASIC_FIELDS = [
+  { id: 'first_name', name: 'first_name' },
+  { id: 'last_name', name: 'last_name' },
+  { id: 'dob', name: 'dob' },
+];
+export const MODULE_NAME = 'Deduplication';