diff --git a/src/main/resources/db/changelog/changes/v2.1.0/changelog-v2.1.0.xml b/src/main/resources/db/changelog/changes/v2.1.0/changelog-v2.1.0.xml
index 154215cf..5ff9f73f 100644
--- a/src/main/resources/db/changelog/changes/v2.1.0/changelog-v2.1.0.xml
+++ b/src/main/resources/db/changelog/changes/v2.1.0/changelog-v2.1.0.xml
@@ -4,5 +4,6 @@
   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 
   <include file="remove-derived-table-name-column.yaml" relativeToChangelogFile="true" />
+  <include file="harvested-views.xml" relativeToChangelogFile="true"/>
 
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/changes/v2.1.0/harvested-views.xml b/src/main/resources/db/changelog/changes/v2.1.0/harvested-views.xml
new file mode 100644
index 00000000..8c2a6ed6
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/v2.1.0/harvested-views.xml
@@ -0,0 +1,194 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+    <changeSet id="create_view_publication_request" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="publication_request" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_publication_request">
+      SELECT * FROM ${tenant_id}_mod_oa.publication_request
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_refdata_value" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="refdata_value" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_refdata_value">
+      SELECT * FROM ${tenant_id}_mod_oa.refdata_value
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_request_party" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="request_party" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_request_party">
+      SELECT * FROM ${tenant_id}_mod_oa.request_party
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_party" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="party" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_party">
+      SELECT * FROM ${tenant_id}_mod_oa.party
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_work" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="work" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_work">
+      SELECT * FROM ${tenant_id}_mod_oa.work
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_title_instance" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="title_instance" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_title_instance">
+      SELECT * FROM ${tenant_id}_mod_oa.title_instance
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_identifier_occurrence" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="identifier_occurrence" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_identifier_occurrence">
+      SELECT * FROM ${tenant_id}_mod_oa.identifier_occurrence
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_identifier" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="identifier" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_identifier">
+      SELECT * FROM ${tenant_id}_mod_oa.identifier
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_identifier_namespace" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="identifier_namespace" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_identifier_namespace">
+      SELECT * FROM ${tenant_id}_mod_oa.identifier_namespace
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_charge" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="charge" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_charge">
+      SELECT * FROM ${tenant_id}_mod_oa.charge
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_monetary_value" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="monetary_value" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_monetary_value">
+      SELECT * FROM ${tenant_id}_mod_oa.monetary_value
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_exchange_rate" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="exchange_rate" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_exchange_rate">
+      SELECT * FROM ${tenant_id}_mod_oa.exchange_rate
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_alternate_email_address" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="alternate_email_address" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_alternate_email_address">
+      SELECT * FROM ${tenant_id}_mod_oa.alternate_email_address
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_checklist_item" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="checklist_item" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_checklist_item">
+      SELECT * FROM ${tenant_id}_mod_oa.checklist_item
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_checklist_item_definition" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="checklist_item_definition" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_checklist_item_definition">
+      SELECT * FROM ${tenant_id}_mod_oa.checklist_item_definition
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_payer" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="payer" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_payer">
+      SELECT * FROM ${tenant_id}_mod_oa.payer
+    </createView>
+  </changeSet>
+
+    <changeSet id="create_view_publication_status" author="your_author_name_here">
+    <preConditions onFail="CONTINUE">
+        <tableExists tableName="publication_status" schemaName="${tenant_id}_mod_oa"/>
+    </preConditions>
+    <createView
+      replaceIfExists="true"
+      viewName="src_oa_publication_status">
+      SELECT * FROM ${tenant_id}_mod_oa.publication_status
+    </createView>
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/src/main/resources/entity-types/openaccess/drv_openaccess_party.json5 b/src/main/resources/entity-types/openaccess/drv_openaccess_party.json5
new file mode 100644
index 00000000..c46917ec
--- /dev/null
+++ b/src/main/resources/entity-types/openaccess/drv_openaccess_party.json5
@@ -0,0 +1,162 @@
+{
+  id: '0f8f6d6f-504f-4aa9-9d98-9779aaaa907b',
+  name: 'drv_openaccess_party',
+  private: false,
+  fromClause: 'src_oa_party AS party\nLEFT JOIN src_oa_alternate_email_address AS alternate_email_address ON alternate_email_address.aea_owner_fk=party.p_id\nLEFT JOIN src_oa_refdata_value AS p_institution_level_1 ON p_institution_level_1.rdv_id=party.p_institution_level_1_fk',
+  columns: [
+    {
+      name: 'party_id',
+      dataType: {
+        dataType: 'stringType',
+      },
+      isIdColumn: true,
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_id',
+    },
+    {
+      name: 'party_version',
+      dataType: {
+        dataType: 'integerType',
+      },
+      isIdColumn: false,
+      queryable: true,
+      visibleByDefault: false,
+      valueGetter: 'party.version',
+    },
+    {
+      name: 'party_title',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'party.p_title',
+    },
+    {
+      name: 'party_family_name',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_family_name',
+    },
+    {
+      name: 'party_given_names',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_given_names',
+    },
+    {
+      name: 'party_full_name',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_full_name',
+    },
+    {
+      name: 'party_orcid_id',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_orcid_id',
+    },
+    {
+      name: 'party_main_email',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_main_email',
+    },
+    {
+      name: 'party_alternate_email',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'alternate_email_address.aea_email',
+    },
+    {
+      name: 'party_alternate_email_id',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'alternate_email_address.aea_id',
+    },
+    {
+      name: 'party_alternate_email_version',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'alternate_email_address.aea_version',
+    },
+    {
+      name: 'party_alternate_email_owner_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      valueGetter: 'alternate_email_address.aea_owner_fk',
+    },
+    {
+      name: 'party_phone',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_phone',
+    },
+    {
+      name: 'party_mobile',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party.p_mobile',
+    },
+    {
+      name: 'party_institution_level_1_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: false,
+      valueGetter: 'p_institution_level_1.rdv_value',
+    },
+    {
+      name: 'party_institution_level_1_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'p_institution_level_1.rdv_label',
+    },
+    {
+      name: 'party_institution_level_2',
+      dataType: {
+        dataType: 'stringType',
+      },
+      valueGetter: 'party.p_institution_level_2',
+    },
+  ],
+  defaultSort: [
+    {
+      columnName: 'party_family_name',
+      direction: 'ASC',
+    },
+  ],
+}
diff --git a/src/main/resources/entity-types/openaccess/drv_openaccess_publication_request.json5 b/src/main/resources/entity-types/openaccess/drv_openaccess_publication_request.json5
new file mode 100644
index 00000000..690842fb
--- /dev/null
+++ b/src/main/resources/entity-types/openaccess/drv_openaccess_publication_request.json5
@@ -0,0 +1,480 @@
+{
+  id: 'da92e15d-5b25-4400-bc2b-5c1c0b3c069e',
+  name: 'drv_openaccess_publication_request',
+  fromClause: 'src_oa_publication_request AS publication_request\nLEFT JOIN src_oa_refdata_value AS pr_status ON pr_status.rdv_id = publication_request.pr_request_status\nLEFT JOIN src_oa_refdata_value AS pr_pub_type ON pr_pub_type.rdv_id = publication_request.pr_pub_type_fk\nLEFT JOIN src_oa_refdata_value AS pr_subtype ON pr_subtype.rdv_id = publication_request.pr_subtype\nLEFT JOIN src_oa_refdata_value AS pr_publisher ON pr_publisher.rdv_id = publication_request.pr_publisher\nLEFT JOIN src_oa_refdata_value AS pr_license ON pr_license.rdv_id = publication_request.pr_license\nLEFT JOIN src_oa_refdata_value AS pr_doaj_status ON pr_doaj_status.rdv_id  = publication_request.pr_work_indexed_in_doaj_fk\nLEFT JOIN src_oa_refdata_value AS pr_oa_status ON pr_oa_status.rdv_id  = publication_request.pr_work_oa_status_fk\nLEFT JOIN src_oa_refdata_value AS pr_corresponding_institution_level_1 ON pr_corresponding_institution_level_1.rdv_id = publication_request.pr_corresponding_institution_level_1_fk\nLEFT JOIN src_oa_refdata_value AS pr_closure_reason ON pr_closure_reason.rdv_id = publication_request.pr_closure_reason_fk\nLEFT JOIN src_oa_request_party AS pr_corresponding_author ON pr_corresponding_author.rp_id = publication_request.pr_corresponding_author_fk\nLEFT JOIN src_oa_refdata_value AS rp_role_corresponding_author ON rp_role_corresponding_author.rdv_id = pr_corresponding_author.rp_role\nLEFT JOIN src_oa_request_party AS pr_request_contact ON pr_request_contact.rp_id = publication_request.pr_request_contact_fk\nLEFT JOIN src_oa_refdata_value AS rp_role_request_contact ON rp_role_request_contact.rdv_id = pr_request_contact.rp_role\nLEFT JOIN src_oa_party AS party_corresponding_author ON party_corresponding_author.p_id = pr_corresponding_author.rp_party_fk\nLEFT JOIN src_oa_party AS party_request_contact ON party_request_contact.p_id = pr_request_contact.rp_party_fk ',
+  columns: [
+    {
+      name: 'oa_pr_id',
+      dataType: {
+        dataType: 'stringType',
+      },
+      isIdColumn: true,
+      queryable: true,
+      valueGetter: 'publication_request.pr_id',
+    },
+    {
+      name: 'oa_pr_request_date',
+      dataType: {
+        dataType: 'dateType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_request_date',
+    },
+    {
+      name: 'oa_pr_date_created',
+      dataType: {
+        dataType: 'dateType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_date_created',
+    },
+    {
+      name: 'oa_pr_last_updated',
+      dataType: {
+        dataType: 'dateType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_last_updated',
+    },
+    {
+      name: 'oa_pr_request_number',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_request_number',
+    },
+    {
+      name: 'oa_pr_title',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_title',
+    },
+    {
+      name: 'oa_pr_request_status',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_request_status',
+    },
+    {
+      name: 'oa_pr_request_status_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_status.rdv_value',
+    },
+    {
+      name: 'oa_pr_request_status_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_status.rdv_label',
+    },
+    {
+      name: 'oa_pr_pub_type_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_pub_type_fk',
+    },
+    {
+      name: 'oa_pr_pub_type_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_pub_type.rdv_value',
+    },
+    {
+      name: 'oa_pr_pub_type_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_pub_type.rdv_label',
+    },
+    {
+      name: 'oa_pr_authnames',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_authnames',
+    },
+    {
+      name: 'oa_pr_corresponding_author_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_corresponding_author_fk',
+    },
+    {
+      name: 'oa_pr_corresponding_author_role_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'rp_role_corresponding_author.rdv_value',
+    },
+    {
+      name: 'oa_pr_corresponding_author_role_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'rp_role_corresponding_author.rdv_label',
+    },
+    {
+      name: 'oa_pr_corresponding_author_name',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party_corresponding_author.p_full_name',
+    },
+    {
+      name: 'oa_pr_corresponding_author_rp_party_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_corresponding_author.rp_party_fk',
+    },
+    {
+      name: 'oa_pr_local_ref',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_local_ref',
+    },
+    {
+      name: 'oa_pr_pub_url',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_pub_url',
+    },
+    {
+      name: 'oa_pr_subtype',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_subtype',
+    },
+    {
+      name: 'oa_pr_subtype_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_subtype.rdv_value',
+    },
+    {
+      name: 'oa_pr_subtype_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_subtype.rdv_label',
+    },
+    {
+      name: 'oa_pr_publisher',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_publisher',
+    },
+    {
+      name: 'oa_pr_publisher_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_publisher.rdv_value',
+    },
+    {
+      name: 'oa_pr_publisher_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_publisher.rdv_label',
+    },
+    {
+      name: 'oa_pr_license',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_license',
+    },
+    {
+      name: 'oa_pr_license_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_license.rdv_value',
+    },
+    {
+      name: 'oa_pr_license_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_license.rdv_label',
+    },
+    {
+      name: 'oa_pr_doi',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_doi',
+    },
+    {
+      name: 'oa_pr_group_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_group_fk',
+    },
+    {
+      name: 'oa_pr_agreement_reference',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_agreement_reference',
+    },
+    {
+      name: 'oa_pr_without_agreement',
+      dataType: {
+        dataType: 'booleanType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_without_agreement',
+    },
+    {
+      name: 'oa_pr_work_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_work_fk',
+    },
+    {
+      name: 'oa_pr_book_date_of_publication',
+      dataType: {
+        dataType: 'dateType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_book_date_of_publication',
+    },
+    {
+      name: 'oa_pr_book_place_of_publication',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_book_place_of_publication',
+    },
+    {
+      name: 'oa_pr_work_indexed_in_doaj_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_work_indexed_in_doaj_fk',
+    },
+    {
+      name: 'oa_pr_work_indexed_in_doaj_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_doaj_status.rdv_value',
+    },
+    {
+      name: 'oa_pr_work_indexed_in_doaj_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_doaj_status.rdv_label',
+    },
+    {
+      name: 'oa_pr_work_oa_status_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_work_oa_status_fk',
+    },
+    {
+      name: 'oa_pr_work_oa_status_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_oa_status.rdv_value',
+    },
+    {
+      name: 'oa_pr_work_oa_status_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_oa_status.rdv_label',
+    },
+    {
+      name: 'oa_pr_corresponding_institution_level_1_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_corresponding_institution_level_1_fk',
+    },
+    {
+      name: 'oa_pr_corresponding_institution_level_1_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_corresponding_institution_level_1.rdv_value',
+    },
+    {
+      name: 'oa_pr_corresponding_institution_level_1_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_corresponding_institution_level_1.rdv_label',
+    },
+    {
+      name: 'oa_pr_corresponding_institution_level_2',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_corresponding_institution_level_2',
+    },
+    {
+      name: 'oa_pr_retrospective_oa',
+      dataType: {
+        dataType: 'booleanType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'publication_request.pr_retrospective_oa',
+    },
+    {
+      name: 'oa_pr_closure_reason_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_closure_reason_fk',
+    },
+    {
+      name: 'oa_pr_closure_reason_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_closure_reason.rdv_value',
+    },
+    {
+      name: 'oa_pr_closure_reason_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'pr_closure_reason.rdv_label',
+    },
+    {
+      name: 'oa_pr_request_contact_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'publication_request.pr_request_contact_fk',
+    },
+    {
+      name: 'oa_pr_request_contact_role_value',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'rp_role_request_contact.rdv_value',
+    },
+    {
+      name: 'oa_pr_request_contact_role_label',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'rp_role_request_contact.rdv_label',
+    },
+    {
+      name: 'oa_pr_request_contact_name',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      visibleByDefault: true,
+      valueGetter: 'party_request_contact.p_full_name',
+    },
+    {
+      name: 'oa_pr_request_contact_rp_party_fk',
+      dataType: {
+        dataType: 'stringType',
+      },
+      queryable: true,
+      valueGetter: 'pr_request_contact.rp_party_fk',
+    },
+  ],
+}
diff --git a/translations/mod-fqm-manager/en.json b/translations/mod-fqm-manager/en.json
index df3d7530..aefe0872 100644
--- a/translations/mod-fqm-manager/en.json
+++ b/translations/mod-fqm-manager/en.json
@@ -1,60 +1,77 @@
 {
-  "entityType.drv_loan_status": "Loan status",
-  "entityType.drv_loan_status.loan_status": "Loan status",
-
-  "entityType.src_inventory_contributor_type": "Contributor type",
-  "entityType.src_inventory_contributor_type.id": "Id",
-  "entityType.src_inventory_contributor_type.contributor_type": "Contributor type",
-
-  "entityType.src_inventory_contributor_name_type": "Contributor name type",
-  "entityType.src_inventory_contributor_name_type.id": "Id",
-  "entityType.src_inventory_contributor_name_type.contributor_name_type": "Contributor name type",
-
-  "entityType.src_inventory_instance_status": "Instance status",
-  "entityType.src_inventory_instance_status.id": "Id",
-  "entityType.src_inventory_instance_status.status": "Status",
-
-  "entityType.src_inventory_mode_of_issuance": "Instance mode of issuance",
-  "entityType.src_inventory_mode_of_issuance.id": "Id",
-  "entityType.src_inventory_mode_of_issuance.mode_of_issuance": "Mode of issuance",
-
+  "entityType.drv_holdings_record_details": "Holdings",
+  "entityType.drv_holdings_record_details.holdings_effective_library_code": "Holdings effective library code",
+  "entityType.drv_holdings_record_details.holdings_effective_library_id": "Holdings effective library ID",
+  "entityType.drv_holdings_record_details.holdings_effective_library_name": "Holdings effective library name",
+  "entityType.drv_holdings_record_details.holdings_effective_location": "Holdings effective location",
+  "entityType.drv_holdings_record_details.holdings_effective_location_id": "Holdings effective location ID",
+  "entityType.drv_holdings_record_details.holdings_hrid": "Holdings HRID",
+  "entityType.drv_holdings_record_details.holdings_permanent_location": "Holdings permanent location",
+  "entityType.drv_holdings_record_details.holdings_permanent_location_id": "Holdings permanent location ID",
+  "entityType.drv_holdings_record_details.holdings_statistical_code_ids": "Holdings statistical code ID list",
+  "entityType.drv_holdings_record_details.holdings_statistical_codes": "Holdings statistical code list",
+  "entityType.drv_holdings_record_details.holdings_suppress_from_discovery": "Holdings suppress from discovery",
+  "entityType.drv_holdings_record_details.holdings_temporary_location": "Holdings temporary location",
+  "entityType.drv_holdings_record_details.holdings_temporary_location_id": "Holdings temporary location ID",
+  "entityType.drv_holdings_record_details.id": "Holdings ID",
+  "entityType.drv_holdings_record_details.instance_id": "Instance UUID",
   "entityType.drv_instances": "Instances",
-  "entityType.drv_instances.instance_cataloged_date": "Instance cataloged date",
-  "entityType.drv_instances.instance_metadata_created_date": "Instance created date",
-  "entityType.drv_instances.instance_hrid": "Instance HRID",
   "entityType.drv_instances.id": "Instance UUID",
-  "entityType.drv_instances.instance_title": "Instance resource title",
+  "entityType.drv_instances.instance_cataloged_date": "Instance cataloged date",
+  "entityType.drv_instances.instance_contributor_name_type": "Instance contributor name type list",
+  "entityType.drv_instances.instance_contributor_type": "Instance contributor type list",
+  "entityType.drv_instances.instance_contributor_type_ids": "Instance contributor type ID list",
+  "entityType.drv_instances.instance_contributor_type_name_ids": "Instance contributor name type ID list",
   "entityType.drv_instances.instance_discovery_suppress": "Instance suppress from discovery",
+  "entityType.drv_instances.instance_hrid": "Instance HRID",
+  "entityType.drv_instances.instance_language": "Instance language",
+  "entityType.drv_instances.instance_metadata_created_date": "Instance created date",
   "entityType.drv_instances.instance_metadata_updated_date": "Instance updated date",
+  "entityType.drv_instances.instance_source": "Instance source",
   "entityType.drv_instances.instance_statistical_code_ids": "Instance statistical code ID list",
   "entityType.drv_instances.instance_statistical_codes": "Instance statistical code list",
   "entityType.drv_instances.instance_status": "Instance status",
-  "entityType.drv_instances.mode_of_issuance": "Instance mode of issuance",
-  "entityType.drv_instances.instance_contributor_type_ids": "Instance contributor type ID list",
-  "entityType.drv_instances.instance_contributor_type": "Instance contributor type list",
   "entityType.drv_instances.instance_status_id": "Instance status ID",
+  "entityType.drv_instances.instance_title": "Instance resource title",
+  "entityType.drv_instances.mode_of_issuance": "Instance mode of issuance",
   "entityType.drv_instances.mode_of_issuance_id": "Instance mode of issuance ID",
-  "entityType.drv_instances.instance_source": "Instance source",
-  "entityType.drv_instances.instance_contributor_type_name_ids": "Instance contributor name type ID list",
-  "entityType.drv_instances.instance_contributor_name_type": "Instance contributor name type list",
-  "entityType.drv_instances.instance_language": "Instance language",
-
-  "entityType.src_inventory_material_type": "Material type",
-  "entityType.src_inventory_material_type.id": "Id",
-  "entityType.src_inventory_material_type.material_type_name": "Material type name",
-
+  "entityType.drv_inventory_statistical_code_full": "Statistical code",
+  "entityType.drv_inventory_statistical_code_full.id": "Statistical code ID",
+  "entityType.drv_inventory_statistical_code_full.statistical_code": "Statistical code",
+  "entityType.drv_item_callnumber_location": "Item, call number and location",
+  "entityType.drv_item_callnumber_location.id": "Item ID",
+  "entityType.drv_item_callnumber_location.item_barcode": "Item barcode",
+  "entityType.drv_item_callnumber_location.item_copy_number": "Item copy number",
+  "entityType.drv_item_callnumber_location.item_created_date": "Item created date",
+  "entityType.drv_item_callnumber_location.item_effective_call_number": "Effective call number",
+  "entityType.drv_item_callnumber_location.item_effective_call_number_type_name": "Effective call number type name",
+  "entityType.drv_item_callnumber_location.item_effective_call_number_typeid": "Effective call number typeId",
+  "entityType.drv_item_callnumber_location.item_effective_library_code": "Item effective library code",
+  "entityType.drv_item_callnumber_location.item_effective_library_id": "Item effective library id",
+  "entityType.drv_item_callnumber_location.item_effective_library_name": "Item effective library name",
+  "entityType.drv_item_callnumber_location.item_effective_location_id": "Item location ID",
+  "entityType.drv_item_callnumber_location.item_effective_location_name": "Item location name",
+  "entityType.drv_item_callnumber_location.item_holdings_record_id": "Holdings record ID",
+  "entityType.drv_item_callnumber_location.item_hrid": "Item hrid",
+  "entityType.drv_item_callnumber_location.item_level_call_number": "Call number",
+  "entityType.drv_item_callnumber_location.item_level_call_number_type_name": "Call number type name",
+  "entityType.drv_item_callnumber_location.item_level_call_number_typeid": "Call number typeId",
+  "entityType.drv_item_callnumber_location.item_material_type": "Material type",
+  "entityType.drv_item_callnumber_location.item_material_type_id": "Material ID",
+  "entityType.drv_item_callnumber_location.item_permanent_location_id": "Item permanent ID",
+  "entityType.drv_item_callnumber_location.item_permanent_location_name": "Item permanent location name",
+  "entityType.drv_item_callnumber_location.item_status": "Item status",
+  "entityType.drv_item_callnumber_location.item_updated_date": "Item updated date",
   "entityType.drv_item_details": "Items",
   "entityType.drv_item_details._custom_field_possessive": "Item's {customField}",
   "entityType.drv_item_details.holdings_id": "Holdings ID",
+  "entityType.drv_item_details.id": "Item ID",
   "entityType.drv_item_details.instance_created_date": "Instance created date",
   "entityType.drv_item_details.instance_id": "Instance ID",
   "entityType.drv_item_details.instance_primary_contributor": "Instance primary contributor",
   "entityType.drv_item_details.instance_title": "Instance title",
   "entityType.drv_item_details.instance_updated_date": "Instance updated date",
   "entityType.drv_item_details.item_barcode": "Item barcode",
-  "entityType.drv_item_details.item_level_call_number": "Item call number",
-  "entityType.drv_item_details.item_level_call_number_type_name": "Item call number type name",
-  "entityType.drv_item_details.item_level_call_number_typeid": "Item call number type ID",
   "entityType.drv_item_details.item_copy_number": "Item copy number",
   "entityType.drv_item_details.item_created_date": "Item created date",
   "entityType.drv_item_details.item_effective_call_number": "Item effective call number",
@@ -66,7 +83,9 @@
   "entityType.drv_item_details.item_effective_location_id": "Item effective location ID",
   "entityType.drv_item_details.item_effective_location_name": "Item effective location name",
   "entityType.drv_item_details.item_hrid": "Item hrid",
-  "entityType.drv_item_details.id": "Item ID",
+  "entityType.drv_item_details.item_level_call_number": "Item call number",
+  "entityType.drv_item_details.item_level_call_number_type_name": "Item call number type name",
+  "entityType.drv_item_details.item_level_call_number_typeid": "Item call number type ID",
   "entityType.drv_item_details.item_material_type": "Item material type",
   "entityType.drv_item_details.item_material_type_id": "Item material ID",
   "entityType.drv_item_details.item_permanent_location_id": "Item permanent ID",
@@ -77,35 +96,34 @@
   "entityType.drv_item_details.item_temporary_location_id": "Item temporary ID",
   "entityType.drv_item_details.item_temporary_location_name": "Item temporary location name",
   "entityType.drv_item_details.item_updated_date": "Item updated date",
-
-  "entityType.drv_item_callnumber_location": "Item, call number and location",
-  "entityType.drv_item_callnumber_location.id": "Item ID",
-  "entityType.drv_item_callnumber_location.item_hrid": "Item hrid",
-  "entityType.drv_item_callnumber_location.item_effective_call_number": "Effective call number",
-  "entityType.drv_item_callnumber_location.item_effective_call_number_typeid": "Effective call number typeId",
-  "entityType.drv_item_callnumber_location.item_effective_call_number_type_name": "Effective call number type name",
-  "entityType.drv_item_callnumber_location.item_level_call_number": "Call number",
-  "entityType.drv_item_callnumber_location.item_level_call_number_typeid": "Call number typeId",
-  "entityType.drv_item_callnumber_location.item_level_call_number_type_name": "Call number type name",
-  "entityType.drv_item_callnumber_location.item_holdings_record_id": "Holdings record ID",
-  "entityType.drv_item_callnumber_location.item_status": "Item status",
-  "entityType.drv_item_callnumber_location.item_copy_number": "Item copy number",
-  "entityType.drv_item_callnumber_location.item_barcode": "Item barcode",
-  "entityType.drv_item_callnumber_location.item_created_date": "Item created date",
-  "entityType.drv_item_callnumber_location.item_updated_date": "Item updated date",
-  "entityType.drv_item_callnumber_location.item_effective_location_id": "Item location ID",
-  "entityType.drv_item_callnumber_location.item_effective_location_name": "Item location name",
-  "entityType.drv_item_callnumber_location.item_effective_library_id": "Item effective library id",
-  "entityType.drv_item_callnumber_location.item_effective_library_name": "Item effective library name",
-  "entityType.drv_item_callnumber_location.item_effective_library_code": "Item effective library code",
-  "entityType.drv_item_callnumber_location.item_permanent_location_id": "Item permanent ID",
-  "entityType.drv_item_callnumber_location.item_permanent_location_name": "Item permanent location name",
-  "entityType.drv_item_callnumber_location.item_material_type_id": "Material ID",
-  "entityType.drv_item_callnumber_location.item_material_type": "Material type",
-
+  "entityType.drv_item_holdingsrecord_instance": "Items, Holdings records, Instance",
+  "entityType.drv_item_holdingsrecord_instance.holdings_id": "Holdings ID",
+  "entityType.drv_item_holdingsrecord_instance.id": "Item ID",
+  "entityType.drv_item_holdingsrecord_instance.instance_created_date": "Instance created date",
+  "entityType.drv_item_holdingsrecord_instance.instance_id": "Instance ID",
+  "entityType.drv_item_holdingsrecord_instance.instance_primary_contributor": "Instance primary contributor",
+  "entityType.drv_item_holdingsrecord_instance.instance_title": "Instance title",
+  "entityType.drv_item_holdingsrecord_instance.instance_updated_date": "Instance updated date",
+  "entityType.drv_item_holdingsrecord_instance.item_barcode": "Item barcode",
+  "entityType.drv_item_holdingsrecord_instance.item_copy_number": "Item copy number",
+  "entityType.drv_item_holdingsrecord_instance.item_created_date": "Item created date",
+  "entityType.drv_item_holdingsrecord_instance.item_effective_call_number": "Item effective call number",
+  "entityType.drv_item_holdingsrecord_instance.item_effective_call_number_typeid": "Item effective call number type ID",
+  "entityType.drv_item_holdingsrecord_instance.item_effective_location_id": "Item location ID",
+  "entityType.drv_item_holdingsrecord_instance.item_hrid": "Item hrid",
+  "entityType.drv_item_holdingsrecord_instance.item_level_call_number": "Item call number",
+  "entityType.drv_item_holdingsrecord_instance.item_level_call_number_typeid": "Item call number type ID",
+  "entityType.drv_item_holdingsrecord_instance.item_material_type_id": "Item material ID",
+  "entityType.drv_item_holdingsrecord_instance.item_permanent_location_id": "Item permanent ID",
+  "entityType.drv_item_holdingsrecord_instance.item_status": "Item status",
+  "entityType.drv_item_holdingsrecord_instance.item_temporary_location_id": "Item temporary ID",
+  "entityType.drv_item_holdingsrecord_instance.item_updated_date": "Item updated date",
+  "entityType.drv_item_status": "Item status",
+  "entityType.drv_item_status.item_status": "Item status",
   "entityType.drv_loan_details": "Loans",
   "entityType.drv_loan_details._custom_field_possessive": "Loan's {customField}",
   "entityType.drv_loan_details.holdings_id": "Holdings ID",
+  "entityType.drv_loan_details.id": "Loan ID",
   "entityType.drv_loan_details.instance_id": "Instance ID",
   "entityType.drv_loan_details.instance_primary_contributor": "Instance primary contributor",
   "entityType.drv_loan_details.instance_title": "Instance title",
@@ -121,7 +139,6 @@
   "entityType.drv_loan_details.loan_checkout_servicepoint_id": "Loan checkout service point ID",
   "entityType.drv_loan_details.loan_checkout_servicepoint_name": "Loan checkout service point name",
   "entityType.drv_loan_details.loan_due_date": "Loan due date",
-  "entityType.drv_loan_details.id": "Loan ID",
   "entityType.drv_loan_details.loan_policy_id": "Loan policy ID",
   "entityType.drv_loan_details.loan_policy_name": "Loan policy name",
   "entityType.drv_loan_details.loan_return_date": "Loan return date",
@@ -135,312 +152,345 @@
   "entityType.drv_loan_details.user_last_name": "User last name",
   "entityType.drv_loan_details.user_patron_group": "User patron group",
   "entityType.drv_loan_details.user_patron_group_id": "User patron group ID",
-
-  "entityType.src_inventory_location": "Location",
-  "entityType.src_inventory_location.id": "Id",
-  "entityType.src_inventory_location.location_name": "Location name",
-  "entityType.src_inventory_location.location_code": "Location code",
-
-  "entityType.src_inventory_call_number_type": "Call number type",
-  "entityType.src_inventory_call_number_type.id": "Id",
-  "entityType.src_inventory_call_number_type.call_number_type_name": "Call number type name",
-
-  "entityType.src_inventory_service_point": "Service point",
-  "entityType.src_inventory_service_point.id": "Id",
-  "entityType.src_inventory_service_point.service_point_name": "Service point name",
-  "entityType.src_inventory_service_point.service_point_code": "Service point code",
-
-  "entityType.drv_item_status": "Item status",
-  "entityType.drv_item_status.item_status": "Item status",
-
-  "entityType.src_inventory_loclibrary": "Loclibrary",
-  "entityType.src_inventory_loclibrary.id": "Id",
-  "entityType.src_inventory_loclibrary.loclibrary_name": "Loclibrary name",
-  "entityType.src_inventory_loclibrary.loclibrary_code": "Loclibrary code",
-
-  "entityType.src_users_groups": "Groups",
-  "entityType.src_users_groups.id": "Id",
-  "entityType.src_users_groups.group": "Group",
-
-  "entityType.src_users_departments": "Departments",
-  "entityType.src_users_departments.id": "Id",
-  "entityType.src_users_departments.department": "Department",
-
-  "entityType.src_users_addresstype": "Address type",
-  "entityType.src_users_addresstype.id": "Id",
-  "entityType.src_users_addresstype.addressType": "Address type",
-
-  "entityType.src_loan_policy_name": "Policy name",
-  "entityType.src_loan_policy_name.id": "Id",
-  "entityType.src_loan_policy_name.policy_name": "Policy name",
-
-  "entityType.drv_item_holdingsrecord_instance": "Items, Holdings records, Instance",
-  "entityType.drv_item_holdingsrecord_instance.holdings_id": "Holdings ID",
-  "entityType.drv_item_holdingsrecord_instance.instance_created_date": "Instance created date",
-  "entityType.drv_item_holdingsrecord_instance.instance_id": "Instance ID",
-  "entityType.drv_item_holdingsrecord_instance.instance_primary_contributor": "Instance primary contributor",
-  "entityType.drv_item_holdingsrecord_instance.instance_title": "Instance title",
-  "entityType.drv_item_holdingsrecord_instance.instance_updated_date": "Instance updated date",
-  "entityType.drv_item_holdingsrecord_instance.item_barcode": "Item barcode",
-  "entityType.drv_item_holdingsrecord_instance.item_level_call_number": "Item call number",
-  "entityType.drv_item_holdingsrecord_instance.item_level_call_number_typeid": "Item call number type ID",
-  "entityType.drv_item_holdingsrecord_instance.item_copy_number": "Item copy number",
-  "entityType.drv_item_holdingsrecord_instance.item_created_date": "Item created date",
-  "entityType.drv_item_holdingsrecord_instance.item_effective_call_number": "Item effective call number",
-  "entityType.drv_item_holdingsrecord_instance.item_effective_call_number_typeid": "Item effective call number type ID",
-  "entityType.drv_item_holdingsrecord_instance.item_effective_location_id": "Item location ID",
-  "entityType.drv_item_holdingsrecord_instance.item_hrid": "Item hrid",
-  "entityType.drv_item_holdingsrecord_instance.id": "Item ID",
-  "entityType.drv_item_holdingsrecord_instance.item_material_type_id": "Item material ID",
-  "entityType.drv_item_holdingsrecord_instance.item_permanent_location_id": "Item permanent ID",
-  "entityType.drv_item_holdingsrecord_instance.item_status": "Item status",
-  "entityType.drv_item_holdingsrecord_instance.item_temporary_location_id": "Item temporary ID",
-  "entityType.drv_item_holdingsrecord_instance.item_updated_date": "Item updated date",
-
-  "entityType.drv_user_details": "Users",
-  "entityType.drv_user_details._custom_field_possessive": "User's {customField}",
-  "entityType.drv_user_details.user_active": "User active",
-  "entityType.drv_user_details.user_address_ids": "User address ID list",
-  "entityType.drv_user_details.user_address_line1": "User address list (line 1)",
-  "entityType.drv_user_details.user_address_line2": "User address list (line 2)",
-  "entityType.drv_user_details.user_address_type_names": "User address type list",
-  "entityType.drv_user_details.user_barcode": "User barcode",
-  "entityType.drv_user_details.user_cities": "User city list",
-  "entityType.drv_user_details.user_country_ids": "User country ID list",
-  "entityType.drv_user_details.user_created_date": "User created date",
-  "entityType.drv_user_details.user_date_of_birth": "User date of birth",
-  "entityType.drv_user_details.user_department_ids": "User department ID list",
-  "entityType.drv_user_details.user_department_names": "User department list",
-  "entityType.drv_user_details.user_email": "User email",
-  "entityType.drv_user_details.user_enrollment_date": "User enrollment date",
-  "entityType.drv_user_details.user_expiration_date": "User expiration date",
-  "entityType.drv_user_details.user_external_system_id": "User external system ID",
-  "entityType.drv_user_details.user_first_name": "User first name",
-  "entityType.drv_user_details.id": "User ID",
-  "entityType.drv_user_details.user_last_name": "User last name",
-  "entityType.drv_user_details.user_middle_name": "User middle name",
-  "entityType.drv_user_details.user_mobile_phone": "User mobile phone",
-  "entityType.drv_user_details.user_patron_group": "User patron group",
-  "entityType.drv_user_details.user_patron_group_id": "User patron group ID",
-  "entityType.drv_user_details.user_phone": "User phone",
-  "entityType.drv_user_details.user_postal_codes": "User postal code list",
-  "entityType.drv_user_details.user_preferred_contact_type": "User preferred contact type",
-  "entityType.drv_user_details.user_preferred_first_name": "User preferred first name",
-  "entityType.drv_user_details.user_primary_address": "User primary address",
-  "entityType.drv_user_details.user_regions": "User region list",
-  "entityType.drv_user_details.user_updated_date": "User updated date",
-  "entityType.drv_user_details.username": "Username",
-
-  "entityType.src_organizations": "organizations",
-  "entityType.src_organizations.id": "ID",
-  "entityType.src_organizations.vendor_name": "Vendor name",
-  "entityType.src_organizations.vendor_code": "Vendor Code",
-
-  "entityType.src_acquisitions_unit": "Acquisitions unit",
-  "entityType.src_acquisitions_unit.id": "ID",
-  "entityType.src_acquisitions_unit.acquisitions_name": "Acquisitions names",
-
-  "entityType.drv_purchase_order_line_details": "Purchase order lines",
-  "entityType.drv_purchase_order_line_details._custom_field_possessive": "Purchase order line's {customField}",
-  "entityType.drv_purchase_order_line_details.acqunit_ids": "Acquisition unit ID list",
-  "entityType.drv_purchase_order_line_details.acquisition_unit": "Acquisition unit list",
-  "entityType.drv_purchase_order_line_details.fund_distribution_code": "Fund distribution code",
-  "entityType.drv_purchase_order_line_details.fund_distribution_encumbrance": "Fund distribution encumbrance",
-  "entityType.drv_purchase_order_line_details.fund_distribution_type": "Fund distribution type",
-  "entityType.drv_purchase_order_line_details.fund_distribution_value": "Fund distribution value",
-  "entityType.drv_purchase_order_line_details.fund_id": "Fund ID",
-  "entityType.drv_purchase_order_line_details.fund_distribution": "Fund distributions",
-  "entityType.drv_purchase_order_line_details.fund_distribution.code": "Code",
-  "entityType.drv_purchase_order_line_details.fund_distribution.code._qualified": "Fund distribution code",
-  "entityType.drv_purchase_order_line_details.fund_distribution.distribution_type": "Distribution type",
-  "entityType.drv_purchase_order_line_details.fund_distribution.distribution_type._qualified": "Fund distribution type",
-  "entityType.drv_purchase_order_line_details.fund_distribution.encumbrance": "Encumbrance",
-  "entityType.drv_purchase_order_line_details.fund_distribution.encumbrance._qualified": "Fund distribution encumbrance",
-  "entityType.drv_purchase_order_line_details.fund_distribution.fund_id": "Fund ID",
-  "entityType.drv_purchase_order_line_details.fund_distribution.fund_id._qualified": "Fund distribution fund ID",
-  "entityType.drv_purchase_order_line_details.fund_distribution.value": "Value",
-  "entityType.drv_purchase_order_line_details.fund_distribution.value._qualified": "Fund distribution value",
-  "entityType.drv_purchase_order_line_details.po_number": "PO number",
-  "entityType.drv_purchase_order_line_details.po_workflow_status": "PO workflow status",
-  "entityType.drv_purchase_order_line_details.po_approved": "PO approved",
-  "entityType.drv_purchase_order_line_details.po_assigned_to": "PO assigned to",
-  "entityType.drv_purchase_order_line_details.po_assigned_to_id": "PO assigned to ID",
-  "entityType.drv_purchase_order_line_details.po_created_by": "PO created by",
-  "entityType.drv_purchase_order_line_details.po_created_by_id": "PO created by ID",
-  "entityType.drv_purchase_order_line_details.po_created_date": "PO created date",
-  "entityType.drv_purchase_order_line_details.po_id": "PO ID",
-  "entityType.drv_purchase_order_line_details.pol_created_by": "POL created by",
-  "entityType.drv_purchase_order_line_details.pol_created_by_id": "POL created by ID",
-  "entityType.drv_purchase_order_line_details.pol_created_date": "POL created date",
-  "entityType.drv_purchase_order_line_details.pol_currency": "POL currency",
-  "entityType.drv_purchase_order_line_details.pol_description": "POL description",
-  "entityType.drv_purchase_order_line_details.pol_estimated_price": "POL estimated price",
-  "entityType.drv_purchase_order_line_details.pol_exchange_rate": "POL exchange rate",
-  "entityType.drv_purchase_order_line_details.id": "POL ID",
-  "entityType.drv_purchase_order_line_details.pol_number": "POL number",
-  "entityType.drv_purchase_order_line_details.pol_payment_status": "POL payment status",
-  "entityType.drv_purchase_order_line_details.pol_receipt_status": "POL receipt status",
-  "entityType.drv_purchase_order_line_details.pol_updated_by": "POL updated by",
-  "entityType.drv_purchase_order_line_details.pol_updated_by_id": "POL updated by ID",
-  "entityType.drv_purchase_order_line_details.pol_updated_date": "POL updated date",
-  "entityType.drv_purchase_order_line_details.po_notes": "PO note list",
-  "entityType.drv_purchase_order_line_details.po_type": "PO type",
-  "entityType.drv_purchase_order_line_details.po_updated_by": "PO updated by",
-  "entityType.drv_purchase_order_line_details.po_updated_by_id": "PO updated by ID",
-  "entityType.drv_purchase_order_line_details.po_updated_date": "PO updated date",
-  "entityType.drv_purchase_order_line_details.vendor_code": "Vendor code",
-  "entityType.drv_purchase_order_line_details.vendor_id": "Vendor ID",
-  "entityType.drv_purchase_order_line_details.vendor_name": "Vendor name",
-
-  "entityType.drv_inventory_statistical_code_full": "Statistical code",
-  "entityType.drv_inventory_statistical_code_full.id": "Statistical code ID",
-  "entityType.drv_inventory_statistical_code_full.statistical_code": "Statistical code",
-
-  "entityType.drv_holdings_record_details": "Holdings",
-  "entityType.drv_holdings_record_details.holdings_effective_location": "Holdings effective location",
-  "entityType.drv_holdings_record_details.holdings_effective_location_id": "Holdings effective location ID",
-  "entityType.drv_holdings_record_details.holdings_effective_library_code": "Holdings effective library code",
-  "entityType.drv_holdings_record_details.holdings_effective_library_name": "Holdings effective library name",
-  "entityType.drv_holdings_record_details.holdings_effective_library_id": "Holdings effective library ID",
-  "entityType.drv_holdings_record_details.instance_id": "Instance UUID",
-  "entityType.drv_holdings_record_details.id": "Holdings ID",
-  "entityType.drv_holdings_record_details.holdings_permanent_location": "Holdings permanent location",
-  "entityType.drv_holdings_record_details.holdings_permanent_location_id": "Holdings permanent location ID",
-  "entityType.drv_holdings_record_details.holdings_hrid": "Holdings HRID",
-  "entityType.drv_holdings_record_details.holdings_suppress_from_discovery": "Holdings suppress from discovery",
-  "entityType.drv_holdings_record_details.holdings_temporary_location": "Holdings temporary location",
-  "entityType.drv_holdings_record_details.holdings_temporary_location_id": "Holdings temporary location ID",
-  "entityType.drv_holdings_record_details.holdings_statistical_code_ids": "Holdings statistical code ID list",
-  "entityType.drv_holdings_record_details.holdings_statistical_codes": "Holdings statistical code list",
-
-  "entityType.src_organization_type": "Organization types",
-  "entityType.src_organization_type.id": "ID",
-  "entityType.src_organization_type.organization_types_name": "Type",
-  "entityType.drv_organization_details" : "Organizations — vendor info",
-  "entityType.drv_organization_details.last_updated": "Organization last updated",
-  "entityType.drv_organization_details.code": "Organization code",
-  "entityType.drv_organization_details.name": "Organization name",
-  "entityType.drv_organization_details.organization_status": "Organization status",
-  "entityType.drv_organization_details.description": "Organization description",
-  "entityType.drv_organization_details.accounting_code": "Organization accounting code",
-  "entityType.drv_organization_details.organization_type_ids": "Organization type IDs",
-  "entityType.drv_organization_details.organization_type_name": "Organization type names",
-  "entityType.drv_organization_details.id": "Organization ID",
-  "entityType.drv_organization_details.alias": "Organization alias",
-  "entityType.drv_organization_details.alias.value": "Value",
-  "entityType.drv_organization_details.alias.value._qualified": "Alias value",
-  "entityType.drv_organization_details.alias.description": "Description",
-  "entityType.drv_organization_details.alias.description._qualified": "Alias description",
-  "entityType.drv_organization_details.payment_method": "Organization payment method",
-  "entityType.drv_organization_details.discount_percent": "Organization discount percent",
-  "entityType.drv_organization_details.claiming_interval": "Organization claiming interval",
-  "entityType.drv_organization_details.export_to_accounting": "Organization export to accounting",
-  "entityType.drv_organization_details.subscription_interval": "Organization subscription interval",
-  "entityType.drv_organization_details.expected_invoice_interval": "Organization expected invoice interval",
-  "entityType.drv_organization_details.expected_receipt_interval": "Organization expected receipt interval",
-  "entityType.drv_organization_details.renewal_activation_interval": "Organization renewal activation interval",
-  "entityType.drv_organization_details.expected_activation_interval": "Organization expected activation interval",
-  "entityType.drv_organization_details.vendor_currencies": "Organization vendor currencies",
-  "entityType.drv_organization_details.tax_id": "Organization tax ID",
-  "entityType.drv_organization_details.tax_percentage": "Organization tax percentage",
-  "entityType.drv_organization_details.agreements": "Organization agreements",
-  "entityType.drv_organization_details.agreements.name": "Vendor terms name",
-  "entityType.drv_organization_details.agreements.name._qualified": "Agreement vendor terms name",
-  "entityType.drv_organization_details.agreements.discount": "Discount percentage",
-  "entityType.drv_organization_details.agreements.discount._qualified": "Agreement discount percentage",
-  "entityType.drv_organization_details.agreements.referenceUrl": "Reference URL",
-  "entityType.drv_organization_details.agreements.referenceUrl._qualified": "Agreement reference URL",
-  "entityType.drv_organization_details.agreements.notes": "Notes",
-  "entityType.drv_organization_details.agreements.notes._qualified": "Agreement notes",
-  "entityType.drv_organization_details.acqunit_ids": "Acquisition unit ID list",
-  "entityType.drv_organization_details.acquisition_unit": "Acquisition unit list",
-  "entityType.drv_organization_details.accounts": "Organization account",
-  "entityType.drv_organization_details.accounts.name": "Name",
-  "entityType.drv_organization_details.accounts.name._qualified": "Account name",
-  "entityType.drv_organization_details.accounts.notes": "Notes",
-  "entityType.drv_organization_details.accounts.notes._qualified": "Account notes",
-  "entityType.drv_organization_details.accounts.accountNo": "Account number",
-  "entityType.drv_organization_details.accounts.accountNo._qualified": "Account number",
-  "entityType.drv_organization_details.accounts.libraryCode": "Library code",
-  "entityType.drv_organization_details.accounts.libraryCode._qualified": "Account library code",
-  "entityType.drv_organization_details.accounts.libraryEdiCode": "Library EDI code",
-  "entityType.drv_organization_details.accounts.libraryEdiCode._qualified": "Account library EDI code",
-  "entityType.drv_organization_details.accounts.accountStatus": "Account status",
-  "entityType.drv_organization_details.accounts.accountStatus._qualified": "Account status",
-  "entityType.drv_organization_details.accounts.paymentMethod": "Payment method",
-  "entityType.drv_organization_details.accounts.paymentMethod._qualified": "Account payment method",
-  "entityType.drv_organization_details.accounts.acqUnitIds": "Acquisition unit ID list",
-  "entityType.drv_organization_details.accounts.acqUnitIds._qualified": "Account acquisition unit ID list",
-  "entityType.drv_organization_details.accounts.contactInfo": "Contact Info",
-  "entityType.drv_organization_details.accounts.contactInfo._qualified": "Account contact Info",
-  "entityType.drv_organization_details.accounts.description": "Description",
-  "entityType.drv_organization_details.accounts.description._qualified": "Account description",
-  "entityType.drv_organization_details.accounts.appSystemNo": "Accounting code",
-  "entityType.drv_organization_details.accounts.appSystemNo._qualified": "Account accounting code",
-  "entityType.drv_organization_details.accounts.acquisition_unit": "Acquisition unit list",
-  "entityType.drv_organization_details.accounts.acquisition_unit._qualified": "Account acquisition unit list",
-
+  "entityType.drv_loan_status": "Loan status",
+  "entityType.drv_loan_status.loan_status": "Loan status",
+  "entityType.drv_openaccess_party": "Open Access party",
+  "entityType.drv_openaccess_party.": "",
+  "entityType.drv_openaccess_party.id": "Party id",
+  "entityType.drv_openaccess_party.party.p_mobile": "OA party mobile phone number",
+  "entityType.drv_openaccess_party.party_alternate_email": "OA party alternate email address",
+  "entityType.drv_openaccess_party.party_alternate_email_id": "OA party alternate email address ID",
+  "entityType.drv_openaccess_party.party_alternate_email_owner_fk": "OA party alternate email address owner foreign key",
+  "entityType.drv_openaccess_party.party_alternate_email_version": "OA party alternate email address version",
+  "entityType.drv_openaccess_party.party_family_name": "OA party family name",
+  "entityType.drv_openaccess_party.party_full_name": "OA party full name",
+  "entityType.drv_openaccess_party.party_given_names": "OA party given names",
+  "entityType.drv_openaccess_party.party_id": "OA party ID",
+  "entityType.drv_openaccess_party.party_institution_level_1_label": "OA party institution level 1 label",
+  "entityType.drv_openaccess_party.party_institution_level_1_value": "OA party institution level 1 value",
+  "entityType.drv_openaccess_party.party_institution_level_2": "OA party institution level 2",
+  "entityType.drv_openaccess_party.party_main_email": "OA party main email address",
+  "entityType.drv_openaccess_party.party_mobile": "OA party mobile phone number",
+  "entityType.drv_openaccess_party.party_orcid_id": "OA party ORCID iD",
+  "entityType.drv_openaccess_party.party_phone": "OA party phone number",
+  "entityType.drv_openaccess_party.party_title": "OA party title",
+  "entityType.drv_openaccess_party.party_version": "OA party version",
+  "entityType.drv_openaccess_publication_request": "Open Access publication request",
+  "entityType.drv_openaccess_publication_request.oa_pr_agreement_reference": "OA pub request agreement reference",
+  "entityType.drv_openaccess_publication_request.oa_pr_authnames": "OA pub request authors",
+  "entityType.drv_openaccess_publication_request.oa_pr_book_date_of_publication": "OA pub request book date of pub",
+  "entityType.drv_openaccess_publication_request.oa_pr_book_place_of_publication": "OA pub request book place of pub",
+  "entityType.drv_openaccess_publication_request.oa_pr_closure_reason_fk": "OA pub request closure reason ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_closure_reason_label": "OA pub request closure reason label",
+  "entityType.drv_openaccess_publication_request.oa_pr_closure_reason_value": "OA pub request closure reason value",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_author_fk": "OA pub request corr. author ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_author_name": "OA pub request corr. author name",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_author_role_label": "OA pub request corr. author role",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_author_role_value": "OA pub request corr. author role value",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_author_rp_party_fk": "OA pub request corr. author party ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_institution_level_1_fk": "OA pub request corresponding institution level 1 ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_institution_level_1_label": "OA pub request corresponding institution level 1 label",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_institution_level_1_value": "OA pub request corresponding institution level 1 value",
+  "entityType.drv_openaccess_publication_request.oa_pr_corresponding_institution_level_2": "OA pub request corresponding institution level 2",
+  "entityType.drv_openaccess_publication_request.oa_pr_date_created": "OA pub request created date",
+  "entityType.drv_openaccess_publication_request.oa_pr_doi": "OA pub request DOI",
+  "entityType.drv_openaccess_publication_request.oa_pr_group_fk": "OA pub request group ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_id": "OA pub request ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_last_updated": "OA pub request last updated",
+  "entityType.drv_openaccess_publication_request.oa_pr_license": "OA pub request license ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_license_label": "OA pub request license",
+  "entityType.drv_openaccess_publication_request.oa_pr_license_value": "OA pub request license value",
+  "entityType.drv_openaccess_publication_request.oa_pr_local_ref": "OA pub request local ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_pub_type_fk": "OA pub request pub type ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_pub_type_label": "OA pub request pub type",
+  "entityType.drv_openaccess_publication_request.oa_pr_pub_type_value": "OA pub request pub type value",
+  "entityType.drv_openaccess_publication_request.oa_pr_pub_url": "OA pub request pub URL",
+  "entityType.drv_openaccess_publication_request.oa_pr_publisher": "OA pub request publisher ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_publisher_label": "OA pub request publisher",
+  "entityType.drv_openaccess_publication_request.oa_pr_publisher_value": "OA pub request publisher value",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_contact_fk": "OA pub request contact ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_contact_name": "OA pub request contact name",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_contact_role_label": "OA pub request contact role label",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_contact_role_value": "OA pub request contact role value",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_contact_rp_party_fk": "OA pub request contact party ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_date": "OA pub request date",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_number": "OA pub request number",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_status": "OA pub request status ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_status_label": "OA pub request status",
+  "entityType.drv_openaccess_publication_request.oa_pr_request_status_value": "OA pub request status value",
+  "entityType.drv_openaccess_publication_request.oa_pr_retrospective_oa": "OA pub request is retrospective",
+  "entityType.drv_openaccess_publication_request.oa_pr_subtype": "OA pub request subtype ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_subtype_label": "OA pub request subtype",
+  "entityType.drv_openaccess_publication_request.oa_pr_subtype_value": "OA pub request subtype value",
+  "entityType.drv_openaccess_publication_request.oa_pr_title": "OA pub request title",
+  "entityType.drv_openaccess_publication_request.oa_pr_without_agreement": "OA pub request is without agreement",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_fk": "OA pub request work ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_indexed_in_doaj_fk": "OA pub request work indexed in DOAJ ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_indexed_in_doaj_label": "OA pub request work indexed in DOAJ",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_indexed_in_doaj_value": "OA pub request work indexed in DOAJ value",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_oa_status_fk": "OA pub request work oa status ID",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_oa_status_label": "OA pub request work oa status label",
+  "entityType.drv_openaccess_publication_request.oa_pr_work_oa_status_value": "OA pub request work oa status value",
   "entityType.drv_organization_contacts": "Organizations — contact info",
-  "entityType.drv_organization_contacts.id": "Organization ID",
-  "entityType.drv_organization_contacts.last_updated": "Organization last updated",
-  "entityType.drv_organization_contacts.name": "Organization name",
-  "entityType.drv_organization_contacts.code": "Organization code",
   "entityType.drv_organization_contacts.accounting_code": "Organization accounting code",
-  "entityType.drv_organization_contacts.organization_status": "Organization status",
-  "entityType.drv_organization_contacts.organization_type_ids": "Organization type IDs",
-  "entityType.drv_organization_contacts.organization_type_name": "Organization type names",
-  "entityType.drv_organization_contacts.description": "Organization description",
-  "entityType.drv_organization_contacts.alias": "Organization alias",
-  "entityType.drv_organization_contacts.alias.value": "Value",
-  "entityType.drv_organization_contacts.alias.value._qualified": "Alias value",
-  "entityType.drv_organization_contacts.alias.description": "Description",
-  "entityType.drv_organization_contacts.alias.description._qualified": "Alias description",
+  "entityType.drv_organization_contacts.acquisition_unit_id": "Acquisition unit IDs",
+  "entityType.drv_organization_contacts.acquisition_unit_name": "Acquisition units",
   "entityType.drv_organization_contacts.address": "Contact addresses",
   "entityType.drv_organization_contacts.address.address_line_1": "Line 1",
   "entityType.drv_organization_contacts.address.address_line_1._qualified": "Contact address line 1",
   "entityType.drv_organization_contacts.address.address_line_2": "Line 2",
   "entityType.drv_organization_contacts.address.address_line_2._qualified": "Contact address line 2",
-  "entityType.drv_organization_contacts.address.city": "City",
-  "entityType.drv_organization_contacts.address.city._qualified": "Contact address city",
-  "entityType.drv_organization_contacts.address.state_region": "State/province",
-  "entityType.drv_organization_contacts.address.state_region._qualified": "Contact address state/province",
-  "entityType.drv_organization_contacts.address.postal_code": "Postal code",
-  "entityType.drv_organization_contacts.address.postal_code._qualified": "Contact address postal code",
-  "entityType.drv_organization_contacts.address.country": "Country",
-  "entityType.drv_organization_contacts.address.country._qualified": "Contact address country",
   "entityType.drv_organization_contacts.address.category_ids": "Category IDs",
   "entityType.drv_organization_contacts.address.category_ids._qualified": "Address category IDs",
   "entityType.drv_organization_contacts.address.category_names": "Categories",
   "entityType.drv_organization_contacts.address.category_names._qualified": "Address category names",
-  "entityType.drv_organization_contacts.phone_number": "Contact phone numbers",
-  "entityType.drv_organization_contacts.phone_number.phone_number": "Phone number",
-  "entityType.drv_organization_contacts.phone_number.phone_number._qualified": "Contact phone number",
-  "entityType.drv_organization_contacts.phone_number.type": "Type",
-  "entityType.drv_organization_contacts.phone_number.type._qualified": "Contact phone number type",
-  "entityType.drv_organization_contacts.phone_number.category_ids": "Category IDs",
-  "entityType.drv_organization_contacts.phone_number.category_ids._qualified": "Phone number category IDs",
-  "entityType.drv_organization_contacts.phone_number.category_names": "Categories",
-  "entityType.drv_organization_contacts.phone_number.category_names._qualified": "Phone number category names",
+  "entityType.drv_organization_contacts.address.city": "City",
+  "entityType.drv_organization_contacts.address.city._qualified": "Contact address city",
+  "entityType.drv_organization_contacts.address.country": "Country",
+  "entityType.drv_organization_contacts.address.country._qualified": "Contact address country",
+  "entityType.drv_organization_contacts.address.postal_code": "Postal code",
+  "entityType.drv_organization_contacts.address.postal_code._qualified": "Contact address postal code",
+  "entityType.drv_organization_contacts.address.state_region": "State/province",
+  "entityType.drv_organization_contacts.address.state_region._qualified": "Contact address state/province",
+  "entityType.drv_organization_contacts.alias": "Organization alias",
+  "entityType.drv_organization_contacts.alias.description": "Description",
+  "entityType.drv_organization_contacts.alias.description._qualified": "Alias description",
+  "entityType.drv_organization_contacts.alias.value": "Value",
+  "entityType.drv_organization_contacts.alias.value._qualified": "Alias value",
+  "entityType.drv_organization_contacts.code": "Organization code",
+  "entityType.drv_organization_contacts.description": "Organization description",
   "entityType.drv_organization_contacts.email": "Contact email addresses",
-  "entityType.drv_organization_contacts.email.email": "Email address",
-  "entityType.drv_organization_contacts.email.email._qualified": "Contact email address",
-  "entityType.drv_organization_contacts.email.description": "Description",
-  "entityType.drv_organization_contacts.email.description._qualified": "Contact email description",
   "entityType.drv_organization_contacts.email.category_ids": "Category IDs",
   "entityType.drv_organization_contacts.email.category_ids._qualified": "Email category IDs",
   "entityType.drv_organization_contacts.email.category_names": "Categories",
   "entityType.drv_organization_contacts.email.category_names._qualified": "Email category names",
+  "entityType.drv_organization_contacts.email.description": "Description",
+  "entityType.drv_organization_contacts.email.description._qualified": "Contact email description",
+  "entityType.drv_organization_contacts.email.email": "Email address",
+  "entityType.drv_organization_contacts.email.email._qualified": "Contact email address",
+  "entityType.drv_organization_contacts.id": "Organization ID",
+  "entityType.drv_organization_contacts.last_updated": "Organization last updated",
+  "entityType.drv_organization_contacts.name": "Organization name",
+  "entityType.drv_organization_contacts.organization_status": "Organization status",
+  "entityType.drv_organization_contacts.organization_type_ids": "Organization type IDs",
+  "entityType.drv_organization_contacts.organization_type_name": "Organization type names",
+  "entityType.drv_organization_contacts.phone_number": "Contact phone numbers",
+  "entityType.drv_organization_contacts.phone_number.category_ids": "Category IDs",
+  "entityType.drv_organization_contacts.phone_number.category_ids._qualified": "Phone number category IDs",
+  "entityType.drv_organization_contacts.phone_number.category_names": "Categories",
+  "entityType.drv_organization_contacts.phone_number.category_names._qualified": "Phone number category names",
+  "entityType.drv_organization_contacts.phone_number.phone_number": "Phone number",
+  "entityType.drv_organization_contacts.phone_number.phone_number._qualified": "Contact phone number",
+  "entityType.drv_organization_contacts.phone_number.type": "Type",
+  "entityType.drv_organization_contacts.phone_number.type._qualified": "Contact phone number type",
   "entityType.drv_organization_contacts.url": "Contact URLs",
-  "entityType.drv_organization_contacts.url.url": "URL",
-  "entityType.drv_organization_contacts.url.url._qualified": "Contact URL",
-  "entityType.drv_organization_contacts.url.description": "Description",
-  "entityType.drv_organization_contacts.url.description._qualified": "Contact URL description",
   "entityType.drv_organization_contacts.url.category_ids": "Category IDs",
   "entityType.drv_organization_contacts.url.category_ids._qualified": "URL category IDs",
   "entityType.drv_organization_contacts.url.category_names": "Categories",
   "entityType.drv_organization_contacts.url.category_names._qualified": "URL category names",
-  "entityType.drv_organization_contacts.acquisition_unit_id": "Acquisition unit IDs",
-  "entityType.drv_organization_contacts.acquisition_unit_name": "Acquisition units",
+  "entityType.drv_organization_contacts.url.description": "Description",
+  "entityType.drv_organization_contacts.url.description._qualified": "Contact URL description",
+  "entityType.drv_organization_contacts.url.url": "URL",
+  "entityType.drv_organization_contacts.url.url._qualified": "Contact URL",
+  "entityType.drv_organization_details": "Organizations — vendor info",
+  "entityType.drv_organization_details.accounting_code": "Organization accounting code",
+  "entityType.drv_organization_details.accounts": "Organization account",
+  "entityType.drv_organization_details.accounts.accountNo": "Account number",
+  "entityType.drv_organization_details.accounts.accountNo._qualified": "Account number",
+  "entityType.drv_organization_details.accounts.accountStatus": "Account status",
+  "entityType.drv_organization_details.accounts.accountStatus._qualified": "Account status",
+  "entityType.drv_organization_details.accounts.acqUnitIds": "Acquisition unit ID list",
+  "entityType.drv_organization_details.accounts.acqUnitIds._qualified": "Account acquisition unit ID list",
+  "entityType.drv_organization_details.accounts.acquisition_unit": "Acquisition unit list",
+  "entityType.drv_organization_details.accounts.acquisition_unit._qualified": "Account acquisition unit list",
+  "entityType.drv_organization_details.accounts.appSystemNo": "Accounting code",
+  "entityType.drv_organization_details.accounts.appSystemNo._qualified": "Account accounting code",
+  "entityType.drv_organization_details.accounts.contactInfo": "Contact Info",
+  "entityType.drv_organization_details.accounts.contactInfo._qualified": "Account contact Info",
+  "entityType.drv_organization_details.accounts.description": "Description",
+  "entityType.drv_organization_details.accounts.description._qualified": "Account description",
+  "entityType.drv_organization_details.accounts.libraryCode": "Library code",
+  "entityType.drv_organization_details.accounts.libraryCode._qualified": "Account library code",
+  "entityType.drv_organization_details.accounts.libraryEdiCode": "Library EDI code",
+  "entityType.drv_organization_details.accounts.libraryEdiCode._qualified": "Account library EDI code",
+  "entityType.drv_organization_details.accounts.name": "Name",
+  "entityType.drv_organization_details.accounts.name._qualified": "Account name",
+  "entityType.drv_organization_details.accounts.notes": "Notes",
+  "entityType.drv_organization_details.accounts.notes._qualified": "Account notes",
+  "entityType.drv_organization_details.accounts.paymentMethod": "Payment method",
+  "entityType.drv_organization_details.accounts.paymentMethod._qualified": "Account payment method",
+  "entityType.drv_organization_details.acquisition_unit": "Acquisition unit list",
+  "entityType.drv_organization_details.acqunit_ids": "Acquisition unit ID list",
+  "entityType.drv_organization_details.agreements": "Organization agreements",
+  "entityType.drv_organization_details.agreements.discount": "Discount percentage",
+  "entityType.drv_organization_details.agreements.discount._qualified": "Agreement discount percentage",
+  "entityType.drv_organization_details.agreements.name": "Vendor terms name",
+  "entityType.drv_organization_details.agreements.name._qualified": "Agreement vendor terms name",
+  "entityType.drv_organization_details.agreements.notes": "Notes",
+  "entityType.drv_organization_details.agreements.notes._qualified": "Agreement notes",
+  "entityType.drv_organization_details.agreements.referenceUrl": "Reference URL",
+  "entityType.drv_organization_details.agreements.referenceUrl._qualified": "Agreement reference URL",
+  "entityType.drv_organization_details.alias": "Organization alias",
+  "entityType.drv_organization_details.alias.description": "Description",
+  "entityType.drv_organization_details.alias.description._qualified": "Alias description",
+  "entityType.drv_organization_details.alias.value": "Value",
+  "entityType.drv_organization_details.alias.value._qualified": "Alias value",
+  "entityType.drv_organization_details.claiming_interval": "Organization claiming interval",
+  "entityType.drv_organization_details.code": "Organization code",
+  "entityType.drv_organization_details.description": "Organization description",
+  "entityType.drv_organization_details.discount_percent": "Organization discount percent",
+  "entityType.drv_organization_details.expected_activation_interval": "Organization expected activation interval",
+  "entityType.drv_organization_details.expected_invoice_interval": "Organization expected invoice interval",
+  "entityType.drv_organization_details.expected_receipt_interval": "Organization expected receipt interval",
+  "entityType.drv_organization_details.export_to_accounting": "Organization export to accounting",
+  "entityType.drv_organization_details.id": "Organization ID",
+  "entityType.drv_organization_details.last_updated": "Organization last updated",
+  "entityType.drv_organization_details.name": "Organization name",
+  "entityType.drv_organization_details.organization_status": "Organization status",
+  "entityType.drv_organization_details.organization_type_ids": "Organization type IDs",
+  "entityType.drv_organization_details.organization_type_name": "Organization type names",
+  "entityType.drv_organization_details.payment_method": "Organization payment method",
+  "entityType.drv_organization_details.renewal_activation_interval": "Organization renewal activation interval",
+  "entityType.drv_organization_details.subscription_interval": "Organization subscription interval",
+  "entityType.drv_organization_details.tax_id": "Organization tax ID",
+  "entityType.drv_organization_details.tax_percentage": "Organization tax percentage",
+  "entityType.drv_organization_details.vendor_currencies": "Organization vendor currencies",
   "entityType.drv_pol_currency": "POL currency",
-  "entityType.drv_pol_currency.currency": "POL currency"
+  "entityType.drv_pol_currency.currency": "POL currency",
+  "entityType.drv_purchase_order_line_details": "Purchase order lines",
+  "entityType.drv_purchase_order_line_details._custom_field_possessive": "Purchase order line's {customField}",
+  "entityType.drv_purchase_order_line_details.acquisition_unit": "Acquisition unit list",
+  "entityType.drv_purchase_order_line_details.acqunit_ids": "Acquisition unit ID list",
+  "entityType.drv_purchase_order_line_details.fund_distribution": "Fund distributions",
+  "entityType.drv_purchase_order_line_details.fund_distribution.code": "Code",
+  "entityType.drv_purchase_order_line_details.fund_distribution.code._qualified": "Fund distribution code",
+  "entityType.drv_purchase_order_line_details.fund_distribution.distribution_type": "Distribution type",
+  "entityType.drv_purchase_order_line_details.fund_distribution.distribution_type._qualified": "Fund distribution type",
+  "entityType.drv_purchase_order_line_details.fund_distribution.encumbrance": "Encumbrance",
+  "entityType.drv_purchase_order_line_details.fund_distribution.encumbrance._qualified": "Fund distribution encumbrance",
+  "entityType.drv_purchase_order_line_details.fund_distribution.fund_id": "Fund ID",
+  "entityType.drv_purchase_order_line_details.fund_distribution.fund_id._qualified": "Fund distribution fund ID",
+  "entityType.drv_purchase_order_line_details.fund_distribution.value": "Value",
+  "entityType.drv_purchase_order_line_details.fund_distribution.value._qualified": "Fund distribution value",
+  "entityType.drv_purchase_order_line_details.fund_distribution_code": "Fund distribution code",
+  "entityType.drv_purchase_order_line_details.fund_distribution_encumbrance": "Fund distribution encumbrance",
+  "entityType.drv_purchase_order_line_details.fund_distribution_type": "Fund distribution type",
+  "entityType.drv_purchase_order_line_details.fund_distribution_value": "Fund distribution value",
+  "entityType.drv_purchase_order_line_details.fund_id": "Fund ID",
+  "entityType.drv_purchase_order_line_details.id": "POL ID",
+  "entityType.drv_purchase_order_line_details.po_approved": "PO approved",
+  "entityType.drv_purchase_order_line_details.po_assigned_to": "PO assigned to",
+  "entityType.drv_purchase_order_line_details.po_assigned_to_id": "PO assigned to ID",
+  "entityType.drv_purchase_order_line_details.po_created_by": "PO created by",
+  "entityType.drv_purchase_order_line_details.po_created_by_id": "PO created by ID",
+  "entityType.drv_purchase_order_line_details.po_created_date": "PO created date",
+  "entityType.drv_purchase_order_line_details.po_id": "PO ID",
+  "entityType.drv_purchase_order_line_details.po_notes": "PO note list",
+  "entityType.drv_purchase_order_line_details.po_number": "PO number",
+  "entityType.drv_purchase_order_line_details.po_type": "PO type",
+  "entityType.drv_purchase_order_line_details.po_updated_by": "PO updated by",
+  "entityType.drv_purchase_order_line_details.po_updated_by_id": "PO updated by ID",
+  "entityType.drv_purchase_order_line_details.po_updated_date": "PO updated date",
+  "entityType.drv_purchase_order_line_details.po_workflow_status": "PO workflow status",
+  "entityType.drv_purchase_order_line_details.pol_created_by": "POL created by",
+  "entityType.drv_purchase_order_line_details.pol_created_by_id": "POL created by ID",
+  "entityType.drv_purchase_order_line_details.pol_created_date": "POL created date",
+  "entityType.drv_purchase_order_line_details.pol_currency": "POL currency",
+  "entityType.drv_purchase_order_line_details.pol_description": "POL description",
+  "entityType.drv_purchase_order_line_details.pol_estimated_price": "POL estimated price",
+  "entityType.drv_purchase_order_line_details.pol_exchange_rate": "POL exchange rate",
+  "entityType.drv_purchase_order_line_details.pol_number": "POL number",
+  "entityType.drv_purchase_order_line_details.pol_payment_status": "POL payment status",
+  "entityType.drv_purchase_order_line_details.pol_receipt_status": "POL receipt status",
+  "entityType.drv_purchase_order_line_details.pol_updated_by": "POL updated by",
+  "entityType.drv_purchase_order_line_details.pol_updated_by_id": "POL updated by ID",
+  "entityType.drv_purchase_order_line_details.pol_updated_date": "POL updated date",
+  "entityType.drv_purchase_order_line_details.vendor_code": "Vendor code",
+  "entityType.drv_purchase_order_line_details.vendor_id": "Vendor ID",
+  "entityType.drv_purchase_order_line_details.vendor_name": "Vendor name",
+  "entityType.drv_user_details": "Users",
+  "entityType.drv_user_details._custom_field_possessive": "User's {customField}",
+  "entityType.drv_user_details.id": "User ID",
+  "entityType.drv_user_details.user_active": "User active",
+  "entityType.drv_user_details.user_address_ids": "User address ID list",
+  "entityType.drv_user_details.user_address_line1": "User address list (line 1)",
+  "entityType.drv_user_details.user_address_line2": "User address list (line 2)",
+  "entityType.drv_user_details.user_address_type_names": "User address type list",
+  "entityType.drv_user_details.user_barcode": "User barcode",
+  "entityType.drv_user_details.user_cities": "User city list",
+  "entityType.drv_user_details.user_country_ids": "User country ID list",
+  "entityType.drv_user_details.user_created_date": "User created date",
+  "entityType.drv_user_details.user_date_of_birth": "User date of birth",
+  "entityType.drv_user_details.user_department_ids": "User department ID list",
+  "entityType.drv_user_details.user_department_names": "User department list",
+  "entityType.drv_user_details.user_email": "User email",
+  "entityType.drv_user_details.user_enrollment_date": "User enrollment date",
+  "entityType.drv_user_details.user_expiration_date": "User expiration date",
+  "entityType.drv_user_details.user_external_system_id": "User external system ID",
+  "entityType.drv_user_details.user_first_name": "User first name",
+  "entityType.drv_user_details.user_last_name": "User last name",
+  "entityType.drv_user_details.user_middle_name": "User middle name",
+  "entityType.drv_user_details.user_mobile_phone": "User mobile phone",
+  "entityType.drv_user_details.user_patron_group": "User patron group",
+  "entityType.drv_user_details.user_patron_group_id": "User patron group ID",
+  "entityType.drv_user_details.user_phone": "User phone",
+  "entityType.drv_user_details.user_postal_codes": "User postal code list",
+  "entityType.drv_user_details.user_preferred_contact_type": "User preferred contact type",
+  "entityType.drv_user_details.user_preferred_first_name": "User preferred first name",
+  "entityType.drv_user_details.user_primary_address": "User primary address",
+  "entityType.drv_user_details.user_regions": "User region list",
+  "entityType.drv_user_details.user_updated_date": "User updated date",
+  "entityType.drv_user_details.username": "Username",
+  "entityType.src_acquisitions_unit": "Acquisitions unit",
+  "entityType.src_acquisitions_unit.acquisitions_name": "Acquisitions names",
+  "entityType.src_acquisitions_unit.id": "ID",
+  "entityType.src_inventory_call_number_type": "Call number type",
+  "entityType.src_inventory_call_number_type.call_number_type_name": "Call number type name",
+  "entityType.src_inventory_call_number_type.id": "Id",
+  "entityType.src_inventory_contributor_name_type": "Contributor name type",
+  "entityType.src_inventory_contributor_name_type.contributor_name_type": "Contributor name type",
+  "entityType.src_inventory_contributor_name_type.id": "Id",
+  "entityType.src_inventory_contributor_type": "Contributor type",
+  "entityType.src_inventory_contributor_type.contributor_type": "Contributor type",
+  "entityType.src_inventory_contributor_type.id": "Id",
+  "entityType.src_inventory_instance_status": "Instance status",
+  "entityType.src_inventory_instance_status.id": "Id",
+  "entityType.src_inventory_instance_status.status": "Status",
+  "entityType.src_inventory_location": "Location",
+  "entityType.src_inventory_location.id": "Id",
+  "entityType.src_inventory_location.location_code": "Location code",
+  "entityType.src_inventory_location.location_name": "Location name",
+  "entityType.src_inventory_loclibrary": "Loclibrary",
+  "entityType.src_inventory_loclibrary.id": "Id",
+  "entityType.src_inventory_loclibrary.loclibrary_code": "Loclibrary code",
+  "entityType.src_inventory_loclibrary.loclibrary_name": "Loclibrary name",
+  "entityType.src_inventory_material_type": "Material type",
+  "entityType.src_inventory_material_type.id": "Id",
+  "entityType.src_inventory_material_type.material_type_name": "Material type name",
+  "entityType.src_inventory_mode_of_issuance": "Instance mode of issuance",
+  "entityType.src_inventory_mode_of_issuance.id": "Id",
+  "entityType.src_inventory_mode_of_issuance.mode_of_issuance": "Mode of issuance",
+  "entityType.src_inventory_service_point": "Service point",
+  "entityType.src_inventory_service_point.id": "Id",
+  "entityType.src_inventory_service_point.service_point_code": "Service point code",
+  "entityType.src_inventory_service_point.service_point_name": "Service point name",
+  "entityType.src_loan_policy_name": "Policy name",
+  "entityType.src_loan_policy_name.id": "Id",
+  "entityType.src_loan_policy_name.policy_name": "Policy name",
+  "entityType.src_organization_type": "Organization types",
+  "entityType.src_organization_type.id": "ID",
+  "entityType.src_organization_type.organization_types_name": "Type",
+  "entityType.src_organizations": "organizations",
+  "entityType.src_organizations.id": "ID",
+  "entityType.src_organizations.vendor_code": "Vendor Code",
+  "entityType.src_organizations.vendor_name": "Vendor name",
+  "entityType.src_users_addresstype": "Address type",
+  "entityType.src_users_addresstype.addressType": "Address type",
+  "entityType.src_users_addresstype.id": "Id",
+  "entityType.src_users_departments": "Departments",
+  "entityType.src_users_departments.department": "Department",
+  "entityType.src_users_departments.id": "Id",
+  "entityType.src_users_groups": "Groups",
+  "entityType.src_users_groups.group": "Group",
+  "entityType.src_users_groups.id": "Id"
 }